mDNSResponder: Update to v878.1.1

The sources can be obtained via:

https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.1.1.tar.gz

Update #3522.

3 files changed, 13 insertions, 70 deletions

diff --git a/mDNSResponder/mDNSMacOSX/Private/dns_sd_private.h b/mDNSResponder/mDNSMacOSX/Private/dns_sd_private.h
deleted file mode 100644
index f3b480ea..00000000
--- a/mDNSResponder/mDNSMacOSX/Private/dns_sd_private.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 4 -*-
- * 
- * Copyright (c) 2015 Apple Inc. All rights reserved.
- */
-
-#ifndef _DNS_SD_PRIVATE_H
-#define _DNS_SD_PRIVATE_H
-
-/* DNSServiceCreateDelegateConnection()
- *
- * 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);
-
-// 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
- *                  the daemon to send the DNS query on the wire.
- *
- * pid:             Process ID of the application that started the name resolution which triggered
- *                  the daemon 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
-);
-
-#define kDNSServiceCompPrivateDNS   "PrivateDNS"
-#define kDNSServiceCompMulticastDNS "MulticastDNS"
-
-#endif
diff --git a/mDNSResponder/mDNSMacOSX/Private/dnsctl_server.c b/mDNSResponder/mDNSMacOSX/Private/dnsctl_server.c
index 9b3885e6..ad5136df 100644
--- a/mDNSResponder/mDNSMacOSX/Private/dnsctl_server.c
+++ b/mDNSResponder/mDNSMacOSX/Private/dnsctl_server.c
@@ -23,7 +23,7 @@ static dispatch_queue_t dnsctlserver_queue = NULL;
 
 mDNSlocal void handle_logging(mDNSu32 log_level)
 {
-    KQueueLock(&mDNSStorage);
+    KQueueLock();
     
     switch (log_level)
     {
@@ -55,12 +55,12 @@ mDNSlocal void handle_logging(mDNSu32 log_level)
     }
     UpdateDebugState();
     
-    KQueueUnlock(&mDNSStorage, "LogLevel changed");
+    KQueueUnlock("LogLevel changed");
 }
 
 mDNSlocal void handle_stateinfo(mDNSu32 state_level)
 {
-    KQueueLock(&mDNSStorage);
+    KQueueLock();
     
     switch (state_level)
     {
@@ -73,13 +73,13 @@ mDNSlocal void handle_stateinfo(mDNSu32 state_level)
             break;
     }
     
-    KQueueUnlock(&mDNSStorage, "StateInfo dumped");
+    KQueueUnlock("StateInfo dumped");
 }
 
 
 mDNSlocal void handle_test_mode(mDNSu32 test_mode)
 {
-    KQueueLock(&mDNSStorage);
+    KQueueLock();
     
     switch (test_mode)
     {
@@ -99,7 +99,7 @@ mDNSlocal void handle_test_mode(mDNSu32 test_mode)
             break;
     }
     
-    KQueueUnlock(&mDNSStorage, "Test Msg to mDNSResponderHelper");
+    KQueueUnlock("Test Msg to mDNSResponderHelper");
 }
 
 mDNSlocal void handle_terminate()
diff --git a/mDNSResponder/mDNSMacOSX/Private/xpc_services.c b/mDNSResponder/mDNSMacOSX/Private/xpc_services.c
index 4cad6ba0..8bf45a4b 100644
--- a/mDNSResponder/mDNSMacOSX/Private/xpc_services.c
+++ b/mDNSResponder/mDNSMacOSX/Private/xpc_services.c
@@ -41,11 +41,11 @@ mDNSlocal void ActivateDNSProxy(mDNSu32 IpIfArr[MaxIp], mDNSu32 OpIf, mDNSBool p
     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);
+    KQueueLock();
+    DNSProxyInit(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");
+        mDNSPlatformInitDNSProxySkts(ProxyUDPCallback, ProxyTCPCallback);
+    KQueueUnlock("DNSProxy Activated");
 }
 
 mDNSlocal void handle_dps_terminate()
@@ -55,11 +55,11 @@ mDNSlocal void handle_dps_terminate()
     // Clear the Client's PID, so that we can now accept new DPS requests
     dps_client_pid = 0;
 
-    KQueueLock(&mDNSStorage);
+    KQueueLock();
     mDNSPlatformCloseDNSProxySkts(&mDNSStorage);
     // TBD: Close TCP Sockets
-    DNSProxyTerminate(&mDNSStorage);
-    KQueueUnlock(&mDNSStorage, "DNSProxy Deactivated");
+    DNSProxyTerminate();
+    KQueueUnlock("DNSProxy Deactivated");
 }
 
 mDNSlocal void handle_dps_request(xpc_object_t req)