version 320.16
diff --git a/Makefile b/Makefile
index 2201ed0..d592d6a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
include /Developer/Makefiles/pb_makefiles/platform.make
-MVERS = "mDNSResponder-320.14.0"
+MVERS = "mDNSResponder-320.16"
DDNSWRITECONFIG = "$(DSTROOT)/Library/Application Support/Bonjour/ddnswriteconfig"
diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c
index a07b8ee..305a1da 100755
--- a/mDNSCore/mDNS.c
+++ b/mDNSCore/mDNS.c
@@ -8078,6 +8078,8 @@
{
LogInfo("ShouldSuppressQuery: Query not suppressed for %##s, qtype %s, Local Address %.4a found", qname, DNSTypeName(qtype),
&i->ip.ip.v4);
+ if (m->SleepState == SleepState_Sleeping)
+ LogInfo("ShouldSuppressQuery: Would have returned true earlier");
return mDNSfalse;
}
else if (iptype == mDNSAddrType_IPv6 &&
@@ -8088,6 +8090,8 @@
{
LogInfo("ShouldSuppressQuery: Query not suppressed for %##s, qtype %s, Local Address %.16a found", qname, DNSTypeName(qtype),
&i->ip.ip.v6);
+ if (m->SleepState == SleepState_Sleeping)
+ LogInfo("ShouldSuppressQuery: Would have returned true earlier");
return mDNSfalse;
}
}
diff --git a/mDNSMacOSX/mDNSMacOSX.c b/mDNSMacOSX/mDNSMacOSX.c
index 07146cf..deb2c43 100644
--- a/mDNSMacOSX/mDNSMacOSX.c
+++ b/mDNSMacOSX/mDNSMacOSX.c
@@ -4488,13 +4488,6 @@
if (InfoSocket < 3 && errno != EAFNOSUPPORT) LogMsg("UpdateInterfaceList: InfoSocket error %d errno %d (%s)", InfoSocket, errno, strerror(errno));
#endif
- // During wakeup, we may get a network change notification e.g., new addresses, before we get
- // a wake notification. This means that we have not set AnnounceOwner. Registering interfaces with
- // core would cause us to probe again which will conflict with the sleep proxy server, if we had
- // registered with it when going to sleep. Hence, need to delay until we get the wake notification
-
- if (m->SleepState == SleepState_Sleeping) ifa = NULL;
-
while (ifa)
{
#if LIST_ALL_INTERFACES
@@ -6544,7 +6537,7 @@
{
if (!AuthRecord_uDNS(rr)) return mDNStrue;
- if (SameDomainLabel(rr->namestorage.c, (const mDNSu8 *)"\x0c_autotunnel6"))
+ 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;
diff --git a/mDNSShared/dns_sd.h b/mDNSShared/dns_sd.h
index 45735c3..e431486 100644
--- a/mDNSShared/dns_sd.h
+++ b/mDNSShared/dns_sd.h
@@ -77,7 +77,7 @@
*/
#ifndef _DNS_SD_H
-#define _DNS_SD_H 3201400
+#define _DNS_SD_H 3201600
#ifdef __cplusplus
extern "C" {
