[src/netbsd-9]: src/external/apache2/mDNSResponder/dist Pull up following rev...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cd406bd1c292
branches:  netbsd-9
changeset: 964032:cd406bd1c292
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jul 26 10:44:28 2020 +0000

description:
Pull up following revision(s) (requested by roy in ticket #1023):

        external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c: revision 1.6
        external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c: revision 1.17
        external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c: revision 1.13
        external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c: revision 1.14

mdnsd: Treat EADDRNOTAVAIL as a transient error

mdnsd: starting and stopping are informational messages

mdnsd: Make the unable to parse resolv.conf message informative

diffstat:

 external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c     |  6 +++---
 external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c       |  3 ++-
 external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c |  6 +++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r d35e91280c09 -r cd406bd1c292 external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
--- a/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c       Mon Jul 20 18:35:18 2020 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c       Sun Jul 26 10:44:28 2020 +0000
@@ -92,7 +92,7 @@
     mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
     mDNS_Lock(m);
     if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0)
-        LogMsg("Unable to parse DNS server list. Unicast DNS-SD unavailable");
+        LogInfo("Unable to parse DNS server list. Unicast DNS-SD unavailable");
     mDNS_Unlock(m);
     ReadDDNSSettingsFromConfFile(m, CONFIG_FILE, &DynDNSHostname, &DynDNSZone, NULL);
     mDNSPlatformSourceAddrForDest(&DynDNSIP, &dummy);
@@ -177,7 +177,7 @@
 
     ParseCmdLinArgs(argc, argv);
 
-    LogMsg("%s starting", mDNSResponderVersionString);
+    LogInfo("%s starting", mDNSResponderVersionString);
 
     err = mDNS_Init(&mDNSStorage, &PlatformStorage, gRRCache, RR_CACHE_SIZE, mDNS_Init_AdvertiseLocalAddresses,
                     mDNS_StatusCallback, mDNS_Init_NoInitCallbackContext);
@@ -200,7 +200,7 @@
     if (mStatus_NoError == err)
         err = MainLoop(&mDNSStorage);
 
-    LogMsg("%s stopping", mDNSResponderVersionString);
+    LogInfo("%s stopping", mDNSResponderVersionString);
 
     mDNS_Close(&mDNSStorage);
 
diff -r d35e91280c09 -r cd406bd1c292 external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
--- a/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Mon Jul 20 18:35:18 2020 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Sun Jul 26 10:44:28 2020 +0000
@@ -195,8 +195,9 @@
     {
         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 (!mDNSAddressIsAllDNSLinkGroup(dst)) {
             if (errno == EHOSTDOWN || errno == ENETDOWN || errno == EHOSTUNREACH || errno == ENETUNREACH) return(mStatus_TransientErr);
+       } else if (errno == EADDRNOTAVAIL) return(mStatus_TransientErr);
 
         if (MessageCount < 1000)
         {
diff -r d35e91280c09 -r cd406bd1c292 external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
--- a/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c   Mon Jul 20 18:35:18 2020 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c   Sun Jul 26 10:44:28 2020 +0000
@@ -70,7 +70,11 @@
     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 (errno != EADDRNOTAVAIL)
+           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; }