CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: thorpej Date: Wed Dec 13 07:15:41 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c Log Message: mDNSPlatformInit(): If we fail to create an IPv6 socket, ignore the error and just continue without IPv6 support. PR bin/57769 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: thorpej
Date: Wed Dec 13 07:15:41 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
Log Message:
mDNSPlatformInit(): If we fail to create an IPv6 socket, ignore the
error and just continue without IPv6 support.
PR bin/57769
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.19 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.20
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.19 Tue Aug 15 00:02:16 2023
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Wed Dec 13 07:15:40 2023
@@ -1324,7 +1324,16 @@ mDNSexport mStatus mDNSPlatformInit(mDNS
#if HAVE_IPV6
sa.sa_family = AF_INET6;
m->p->unicastSocket6 = -1;
-if (err == mStatus_NoError) err = SetupSocket(, zeroIPPort, 0, >p->unicastSocket6);
+if (err == mStatus_NoError)
+{
+ err = SetupSocket(, zeroIPPort, 0, >p->unicastSocket6);
+ if (err != mStatus_NoError)
+ {
+ // Ignore errors configuring IPv6.
+ m->p->unicastSocket6 = -1;
+ err = mStatus_NoError;
+ }
+}
#endif
// Tell mDNS core about the network interfaces on this machine.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: gutteridge
Date: Tue Sep 12 21:19:53 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c
Log Message:
DNSCommon.c: fix punctuation in a comment
This has very little value in itself; it's intended to make a material
change to this file to facilitate rebuilds. Otherwise, people running
update builds on branches will run into mismatches and build failures
after our switch to use arc4random(3). (That is, this change is
intended to be pulled up.)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.10 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.11
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.10 Sun Aug 13 18:57:07 2023
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Tue Sep 12 21:19:53 2023
@@ -3754,7 +3754,7 @@ mDNSexport mStatus mDNSSendDNSMessage(mD
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
+// 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);
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: gutteridge Date: Tue Sep 12 21:19:53 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c Log Message: DNSCommon.c: fix punctuation in a comment This has very little value in itself; it's intended to make a material change to this file to facilitate rebuilds. Otherwise, people running update builds on branches will run into mismatches and build failures after our switch to use arc4random(3). (That is, this change is intended to be pulled up.) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: gutteridge Date: Tue Aug 15 00:02:16 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c Log Message: mDNSPosix.c: free very large struct on error path To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.18 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.19 --- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.18 Sun Aug 13 18:57:07 2023 +++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Tue Aug 15 00:02:16 2023 @@ -1266,6 +1266,8 @@ mDNSlocal mStatus WatchForInterfaceChang err = OpenIfNotifySocket(>NotifySD); if (err == 0) err = mDNSPosixAddFDToEventLoop(pChgRec->NotifySD, InterfaceChangeCallback, pChgRec); +if (err) +mDNSPlatformMemFree(pChgRec); return err; }
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: gutteridge Date: Tue Aug 15 00:02:16 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c Log Message: mDNSPosix.c: free very large struct on error path To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: gutteridge
Date: Fri Jun 30 02:03:59 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
Log Message:
PosixDaemon.c: restore NetBSD logging additions lost in merges
Restore part of local modifications r. 1.2 & 1.4 from tsarna@. One
aspect could not be carried forward, as Apple dropped the bug detection
query functionality that was formerly represented by the teststate
member of the DNSServer struct. Otherwise, reapplied almost verbatim,
except for minor consistency and style changes.
This was added again in part as an example should there be a need to
add further logging content for NetBSD's purposes. (DumpStateLog() has
changed further as of Apple's 1790.80.10 release, but should we roll
forward, our means here should still be viable.)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.17 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.18
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.17 Fri Jun 30 01:59:45 2023
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Fri Jun 30 02:03:58 2023
@@ -125,11 +125,38 @@ mDNSlocal void ParseCmdLinArgs(int argc,
}
}
-mDNSlocal void DumpStateLog()
+mDNSlocal void DumpStateLog(mDNS *const m)
// Dump a little log of what we've been up to.
{
+DNSServer *s;
+PosixNetworkInterface *i;
+
LogMsg(" BEGIN STATE LOG ");
udsserver_info();
+
+LogMsgNoIdent("- Network Interfaces ---");
+for (i = (PosixNetworkInterface*)(m->HostInterfaces);
+ i; i = (PosixNetworkInterface *)(i->coreIntf.next))
+{
+LogMsg("%p %p %d %s%s%s%s%s %-8s %#a", i,
+ (void *)(i->coreIntf.InterfaceID), i->index,
+ i->coreIntf.InterfaceActive ? "-" : "D",
+ i->coreIntf.IPv4Available ? "4" : "-",
+ i->coreIntf.IPv6Available ? "6" : "-",
+ i->coreIntf.Advertise ? "A" : "-",
+ i->coreIntf.McastTxRx ? "M" : "-",
+ i->intfName, &(i->coreIntf.ip));
+}
+
+LogMsgNoIdent("- DNS Servers --");
+if (!m->DNSServers) LogMsgNoIdent("");
+else
+{
+for (s = m->DNSServers; s; s = s->next)
+LogMsgNoIdent("DNS Server %##s %#a:%d",
+ s->domain.c, >addr, mDNSVal16(s->port));
+}
+
LogMsg(" END STATE LOG ");
}
@@ -167,7 +194,7 @@ mDNSlocal mStatus MainLoop(mDNS *m) // L
(void) mDNSPosixRunEventLoopOnce(m, , , );
if (sigismember(, SIGHUP )) Reconfigure(m);
-if (sigismember(, SIGUSR1)) DumpStateLog();
+if (sigismember(, 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(, SIGPIPE)) LogMsg("Received SIGPIPE - ignoring");
if (sigismember(, SIGINT) || sigismember(, SIGTERM)) break;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: gutteridge Date: Fri Jun 30 02:03:59 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c Log Message: PosixDaemon.c: restore NetBSD logging additions lost in merges Restore part of local modifications r. 1.2 & 1.4 from tsarna@. One aspect could not be carried forward, as Apple dropped the bug detection query functionality that was formerly represented by the teststate member of the DNSServer struct. Otherwise, reapplied almost verbatim, except for minor consistency and style changes. This was added again in part as an example should there be a need to add further logging content for NetBSD's purposes. (DumpStateLog() has changed further as of Apple's 1790.80.10 release, but should we roll forward, our means here should still be viable.) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: gutteridge
Date: Fri Jun 30 01:59:45 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
Log Message:
PosixDaemon.c: convert tabs to spaces to match coding style
Match Apple's coding style for this project. (In part for those of us
who have tabs visually representing four spaces!)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.16 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.17
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.16 Mon May 29 21:16:58 2023
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Fri Jun 30 01:59:45 2023
@@ -128,7 +128,7 @@ mDNSlocal void ParseCmdLinArgs(int argc,
mDNSlocal void DumpStateLog()
// Dump a little log of what we've been up to.
{
- LogMsg(" BEGIN STATE LOG ");
+LogMsg(" BEGIN STATE LOG ");
udsserver_info();
LogMsg(" END STATE LOG ");
}
@@ -196,10 +196,10 @@ int main(int argc, char **argv)
{
const struct passwd *pw = getpwnam(MDNSD_USER);
if (pw != NULL)
- {
+{
setgid(pw->pw_gid);
setuid(pw->pw_uid);
- }
+}
else
#ifdef MDNSD_NOROOT
{
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: gutteridge Date: Fri Jun 30 01:59:45 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c Log Message: PosixDaemon.c: convert tabs to spaces to match coding style Match Apple's coding style for this project. (In part for those of us who have tabs visually representing four spaces!) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: andvar Date: Mon May 29 21:16:58 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c Log Message: mdnsd(8): restore fixes for PR bin/46758, lost on resolving merge conflicts. Original commit message from Roy Marples: "Derive our primary interface and address by trying to connect to an address in the TEST-NET-2 network as noted in RFC5737 instead of using the 1.1.1.1 address. Also, use port 7 (echo) for better style. Fixes PR bin/46758 thanks to Lloyd Parkes." pullups needed for netbsd-9, netbsd-10. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src
Committed By: andvar
Date: Mon May 29 21:16:58 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c
Log Message:
mdnsd(8): restore fixes for PR bin/46758, lost on resolving merge conflicts.
Original commit message from Roy Marples:
"Derive our primary interface and address by trying to connect to an
address in the TEST-NET-2 network as noted in RFC5737 instead of using
the 1.1.1.1 address. Also, use port 7 (echo) for better style.
Fixes PR bin/46758 thanks to Lloyd Parkes."
pullups needed for netbsd-9, netbsd-10.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.15 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.16
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.15 Sat May 27 17:58:58 2023
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Mon May 29 21:16:58 2023
@@ -92,7 +92,7 @@ mDNSlocal void mDNS_StatusCallback(mDNS
static void Reconfigure(mDNS *m)
{
mDNSAddr DynDNSIP;
-const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
+const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 198, 51, 100, 42 } } } };;
mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
mDNS_Lock(m);
if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0)
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.6 src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.7
--- src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.6 Tue Jul 21 14:04:07 2020
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c Mon May 29 21:16:58 2023
@@ -52,7 +52,7 @@ mDNSexport void mDNSPlatformSourceAddrFo
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_port= 7;// Not important, any port will do
addr.a4.sin_addr.s_addr = dst->ip.v4.NotAnInteger;
}
else if (dst->type == mDNSAddrType_IPv6)
@@ -63,7 +63,7 @@ mDNSexport void mDNSPlatformSourceAddrFo
#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_port = 7; // Not important, any port will do
addr.a6.sin6_addr = *(struct in6_addr*)>ip.v6;
addr.a6.sin6_scope_id = 0;
}
@@ -71,9 +71,17 @@ mDNSexport void mDNSPlatformSourceAddrFo
if ((connect(sock, , inner_len)) < 0)
{
-if (errno != EADDRNOTAVAIL)
- LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
- goto exit;
+static mDNSv4Addr dummy = { 198, 51, 100, 42 };
+
+// Don't spam if we can't connect to 198.51.100.42 to the console.
+// That is our test address to out which interfaces/address should be primary and is also
+// configured in mDNSPosix/PosixDaemon.c:Reconfigure()
+// Failing to connect to it with EADDRNOTAVAIL is a common situation, especially on boot up.
+if (dst->type == mDNSAddrType_IPv4 && dst->ip.v4.NotAnInteger == dummy.NotAnInteger && errno == EADDRNOTAVAIL)
+LogInfo("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
+else
+LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
+goto exit;
}
if ((getsockname(sock, , )) < 0)
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: andvar
Date: Sat May 27 17:58:59 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
Log Message:
reapply changes for the built-in drop-privs support by tsarna.
this commit doesn't reapply "dumping of the unicast server list
to the DumpStateLog debugging output" enhancement.
It doesn't build anymore, no idea how to rewrite.
Should fix PR 57442. Needs pull-ups for netbsd-9, netbsd-10.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.14 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.15
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.14 Wed Jul 22 19:05:14 2020
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Sat May 27 17:58:58 2023
@@ -50,6 +50,10 @@ extern int daemon(int, int);
#include "PlatformCommon.h"
#include "DNSCommon.h"
+#ifndef MDNSD_USER
+#define MDNSD_USER "nobody"
+#endif
+
#define CONFIG_FILE "/etc/mdnsd.conf"
static domainname DynDNSZone;// Default wide-area zone for service registration
static domainname DynDNSHostname;
@@ -190,11 +194,21 @@ int main(int argc, char **argv)
// Now that we're finished with anything privileged, switch over to running as "nobody"
if (mStatus_NoError == err)
{
-const struct passwd *pw = getpwnam("nobody");
+const struct passwd *pw = getpwnam(MDNSD_USER);
if (pw != NULL)
+ {
+setgid(pw->pw_gid);
setuid(pw->pw_uid);
+ }
else
-LogMsg("WARNING: mdnsd continuing as root because user \"nobody\" does not exist");
+#ifdef MDNSD_NOROOT
+{
+LogMsg("WARNING: mdnsd exiting because user \""MDNSD_USER"\" does not exist");
+err = mStatus_Invalid;
+}
+#else
+LogMsg("WARNING: mdnsd continuing as root because user \""MDNSD_USER"\" does not exist");
+#endif
}
if (mStatus_NoError == err)
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: andvar Date: Sat May 27 17:58:59 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c Log Message: reapply changes for the built-in drop-privs support by tsarna. this commit doesn't reapply "dumping of the unicast server list to the DumpStateLog debugging output" enhancement. It doesn't build anymore, no idea how to rewrite. Should fix PR 57442. Needs pull-ups for netbsd-9, netbsd-10. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: roy
Date: Wed Jul 22 19:05:14 UTC 2020
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
Log Message:
mdnsd: Make the unable to parse resolv.conf message informative
resovconf will SIGHUP mdnsd when resolv.conf changes so this message
should not be an error.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.13 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.14
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.13 Tue Jul 21 14:11:39 2020
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Wed Jul 22 19:05:14 2020
@@ -92,7 +92,7 @@ static void Reconfigure(mDNS *m)
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, , , NULL);
mDNSPlatformSourceAddrForDest(, );
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Wed Jul 22 19:05:14 UTC 2020 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c Log Message: mdnsd: Make the unable to parse resolv.conf message informative resovconf will SIGHUP mdnsd when resolv.conf changes so this message should not be an error. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Tue Jul 21 14:11:39 UTC 2020 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c Log Message: mdnsd: starting and stopping are informational messages To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: roy
Date: Tue Jul 21 14:11:39 UTC 2020
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
Log Message:
mdnsd: starting and stopping are informational messages
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.12 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.13
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.12 Wed Apr 11 18:34:18 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Tue Jul 21 14:11:39 2020
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
ParseCmdLinArgs(argc, argv);
-LogMsg("%s starting", mDNSResponderVersionString);
+LogInfo("%s starting", mDNSResponderVersionString);
err = mDNS_Init(, , gRRCache, RR_CACHE_SIZE, mDNS_Init_AdvertiseLocalAddresses,
mDNS_StatusCallback, mDNS_Init_NoInitCallbackContext);
@@ -200,7 +200,7 @@ int main(int argc, char **argv)
if (mStatus_NoError == err)
err = MainLoop();
-LogMsg("%s stopping", mDNSResponderVersionString);
+LogInfo("%s stopping", mDNSResponderVersionString);
mDNS_Close();
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src
Committed By: roy
Date: Tue Jul 21 14:04:07 UTC 2020
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c
Log Message:
mdnsd: Treat EADDRNOTAVAIL as a transient error
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.17
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16 Mon Nov 19 08:14:28 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Tue Jul 21 14:04:07 2020
@@ -195,8 +195,9 @@ mDNSexport mStatus mDNSPlatformSendUDP(c
{
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)
{
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.5 src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.6
--- src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.5 Wed May 2 12:12:13 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c Tue Jul 21 14:04:07 2020
@@ -70,7 +70,11 @@ mDNSexport void mDNSPlatformSourceAddrFo
else return;
if ((connect(sock, , 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, , )) < 0)
{ LogMsg("mDNSPlatformSourceAddrForDest: getsockname failed errno %d (%s)", errno, strerror(errno)); goto exit; }
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: roy Date: Tue Jul 21 14:04:07 UTC 2020 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c Log Message: mdnsd: Treat EADDRNOTAVAIL as a transient error To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: thorpej Date: Thu Jul 4 15:54:09 UTC 2019 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_ipc.h Log Message: Get the very generically-named put_uint32(), etc. out of the application namespace. These symbols are not intended to be used outside of the dns_sd library. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.7 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.8 --- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.7 Wed Jan 17 06:10:28 2018 +++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h Thu Jul 4 15:54:09 2019 @@ -188,6 +188,18 @@ typedef packedstruct // 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 +// Keep these out of the general namespace -- they're only used internally +// by the library. +#define put_uint32 __dnssd_ipc_put_uint32 +#define get_uint32 __dnssd_ipc_get_uint32 +#define put_uint16 __dnssd_ipc_put_uint16 +#define get_uint16 __dnssd_ipc_get_uint16 +#define put_string __dnssd_ipc_put_string +#define get_string __dnssd_ipc_get_string +#define put_rdata __dnssd_ipc_put_rdata +#define get_rdata __dnssd_ipc_get_rdata +#define ConvertHeaderBytes __dnssd_ipc_ConvertHeaderBytes + void put_uint32(const uint32_t l, char **ptr); uint32_t get_uint32(const char **ptr, const char *end);
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: thorpej Date: Thu Jul 4 15:54:09 UTC 2019 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_ipc.h Log Message: Get the very generically-named put_uint32(), etc. out of the application namespace. These symbols are not intended to be used outside of the dns_sd library. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Date:Mon, 19 Nov 2018 12:25:23 + From:Roy Marples Message-ID: <9b4f1054-1005-eac3-cb12-af6227d36...@marples.name> | I can plug a usb stick in later which mdnsd could work with, so xtos's | change is fine. I didn't ever doubt that the change would work, just wondered if there might be a better way. Christos' reply to my message convinced me that the way it is now is fine, even though the code as written is basically nonsense (but harmless nonsense.) kre
Re: CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
On 19/11/2018 10:42, Robert Elz wrote: Date:Mon, 19 Nov 2018 03:14:28 -0500 From:"Christos Zoulas" Message-ID: <20181119081428.def1cf...@cvs.netbsd.org> | Modified Files: |src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c | It is not an error if we did not find any IPv4 interfaces. It could | be the case we never have V4 interfaces (in a V6 system) so this | is bogus. Rather than just removing the test, a better fix would be to move it to after the v6 interfaces are added?That way it really would be testing if there are no interfaces at all (in which case this code is not going to accomplish much). My pinebook only has the loopback interface when it boots and mdnsd bails accordingly. I can plug a usb stick in later which mdnsd could work with, so xtos's change is fine. Roy
Re: CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
The code can handle having no interfaces, because interfaces can be configured in the future. The problem is that if this function returns an error (ie there were no configured interfaces during startup) the daemon will exit, and this is not desirable. Restructuring the code too much will result in merge pain in the future... We should find who maintains that code and contribute all the bug fixes... christos > On Nov 19, 2018, at 12:42 PM, Robert Elz wrote: > >Date:Mon, 19 Nov 2018 03:14:28 -0500 >From:"Christos Zoulas" >Message-ID: <20181119081428.def1cf...@cvs.netbsd.org> > > | Modified Files: > |src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c > > > | It is not an error if we did not find any IPv4 interfaces. It could > | be the case we never have V4 interfaces (in a V6 system) so this > | is bogus. > > Rather than just removing the test, a better fix would be to move it > to after the v6 interfaces are added?That way it really would be > testing if there are no interfaces at all (in which case this code is > not going to accomplish much). > > Otherwise, the "err" variable should just be removed, and the function > made to return 0 as "err" is init'd to 0, tested a couple of times, and then > returned (but never updated) as the code stands now. > > kre
Re: CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Date:Mon, 19 Nov 2018 03:14:28 -0500 From:"Christos Zoulas" Message-ID: <20181119081428.def1cf...@cvs.netbsd.org> | Modified Files: | src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c | It is not an error if we did not find any IPv4 interfaces. It could | be the case we never have V4 interfaces (in a V6 system) so this | is bogus. Rather than just removing the test, a better fix would be to move it to after the v6 interfaces are added?That way it really would be testing if there are no interfaces at all (in which case this code is not going to accomplish much). Otherwise, the "err" variable should just be removed, and the function made to return 0 as "err" is init'd to 0, tested a couple of times, and then returned (but never updated) as the code stands now. kre
Re: CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Thanks! This has been bothering me for a while, but I hadn’t had a chance to look at it. -- thorpej Sent from my iPhone. > On Nov 19, 2018, at 8:14 AM, Christos Zoulas wrote: > > Module Name:src > Committed By:christos > Date:Mon Nov 19 08:14:28 UTC 2018 > > Modified Files: >src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c > > Log Message: > It is not an error if we did not find any IPv4 interfaces. It could > be the case we never have V4 interfaces (in a V6 system) so this > is bogus. The code was recently changed to ignore loopback interfaces. > If mdnsd was started too early, this means that no interfaces would > be found (since interfaces down, with no addresses, or tentative > are ignored). I put back the loopback interfaces yesterday to avoid > this error, but this seems like the left hand not knowing what the > right hand does because whoever removed the loopback interfaces > from the list, did not read the 'self discovery' comment and the > special code that deals with loopback in this file. Nevertheless, > I think it is better to ignore the loopback interfaces in the long > run, but it is ok to keep them around since the code is handling > them just fine (and works both with and without them). > > > To generate a diff of this commit: > cvs rdiff -u -r1.15 -r1.16 \ >src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. >
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: christos
Date: Mon Nov 19 08:14:28 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
Log Message:
It is not an error if we did not find any IPv4 interfaces. It could
be the case we never have V4 interfaces (in a V6 system) so this
is bogus. The code was recently changed to ignore loopback interfaces.
If mdnsd was started too early, this means that no interfaces would
be found (since interfaces down, with no addresses, or tentative
are ignored). I put back the loopback interfaces yesterday to avoid
this error, but this seems like the left hand not knowing what the
right hand does because whoever removed the loopback interfaces
from the list, did not read the 'self discovery' comment and the
special code that deals with loopback in this file. Nevertheless,
I think it is better to ignore the loopback interfaces in the long
run, but it is ok to keep them around since the code is handling
them just fine (and works both with and without them).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.15 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.15 Sun Feb 25 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Mon Nov 19 03:14:28 2018
@@ -977,7 +977,9 @@ mDNSlocal int SetupInterfaceList(mDNS *c
assert(m != NULL);
debugf("SetupInterfaceList");
+#if 0
if (intfList == NULL) err = ENOENT;
+#endif
#if HAVE_IPV6
if (err == 0) /* Link the IPv6 list to the end of the IPv4 list */
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: christos Date: Mon Nov 19 08:14:28 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c Log Message: It is not an error if we did not find any IPv4 interfaces. It could be the case we never have V4 interfaces (in a V6 system) so this is bogus. The code was recently changed to ignore loopback interfaces. If mdnsd was started too early, this means that no interfaces would be found (since interfaces down, with no addresses, or tentative are ignored). I put back the loopback interfaces yesterday to avoid this error, but this seems like the left hand not knowing what the right hand does because whoever removed the loopback interfaces from the list, did not read the 'self discovery' comment and the special code that deals with loopback in this file. Nevertheless, I think it is better to ignore the loopback interfaces in the long run, but it is ok to keep them around since the code is handling them just fine (and works both with and without them). To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: christos Date: Sun Nov 18 18:58:05 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: uds_daemon.c Log Message: print the path of the unix socket we could not create. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src
Committed By: christos
Date: Sun Nov 18 18:58:05 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: uds_daemon.c
Log Message:
print the path of the unix socket we could not create.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.11 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.12
--- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.11 Sun Feb 4 15:38:41 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Sun Nov 18 13:58:05 2018
@@ -5139,7 +5139,7 @@ mDNSexport int udsserver_init(dnssd_sock
umask(mask);
if (ret < 0)
{
-my_perror("ERROR: bind(listenfd, (struct sockaddr *) , sizeof(laddr)); failed");
+LogMsg("ERROR: bind(listenfd, (struct sockaddr *) , sizeof(laddr)); failed `%s': %s", boundPath, strerror(errno));
goto error;
}
}
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: christos Date: Sun Nov 18 18:57:12 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Log Message: NFC: Fix commit message: Include the loopback so that we don't return an empty address list before addresses are configured. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.11 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.12 --- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.11 Sun Nov 18 13:55:49 2018 +++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Sun Nov 18 13:57:12 2018 @@ -304,7 +304,7 @@ struct ifi_info *get_ifi_info(int family continue; /* ignore if interface not up */ -#if 0 +#ifdef notdef /* * Include the loopback so that we return at least one * address, so that mdnsd does not exit before we get
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: christos Date: Sun Nov 18 18:57:12 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Log Message: NFC: Fix commit message: Include the loopback so that we don't return an empty address list before addresses are configured. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: christos Date: Sun Nov 18 18:55:49 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Added Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSBSD.c Log Message: Add a simpler version to do interface enumeration that uses getifaddrs(3) To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSBSD.c cvs rdiff -u -r1.10 -r1.11 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: christos
Date: Sun Nov 18 18:55:49 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c
Added Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSBSD.c
Log Message:
Add a simpler version to do interface enumeration that uses getifaddrs(3)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSBSD.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.10 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.11
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.10 Sat Apr 7 15:18:16 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Sun Nov 18 13:55:49 2018
@@ -303,8 +303,16 @@ struct ifi_info *get_ifi_info(int family
if ((flags & IFF_UP) == 0)
continue; /* ignore if interface not up */
+
+#if 0
+ /*
+ * Include the loopback so that we return at least one
+ * address, so that mdnsd does not exit before we get
+ * a dhcp address
+ */
if ((flags & IFF_LOOPBACK))
continue; /* ignore loopback interfaces */
+#endif
/* Skip addresses we can't use */
#ifdef SIOCGIFAFLAG_IN
Added files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSBSD.c
diff -u /dev/null src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSBSD.c:1.1
--- /dev/null Sun Nov 18 13:55:49 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSBSD.c Sun Nov 18 13:55:49 2018
@@ -0,0 +1,314 @@
+/* -*- 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
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+static int
+copyaddr(struct sockaddr **dst, const struct sockaddr *src, socklen_t len)
+{
+ if (src == NULL)
+ return 1;
+
+ *dst = calloc(1, len);
+ if (*dst == NULL)
+ return 0;
+
+ memcpy(*dst, src, len);
+ return 1;
+}
+
+struct ifi_info *
+get_ifi_info(int family, int doaliases)
+{
+ struct ifi_info *ifi, *ifihead, **ifipnext, *ifipold, **ifiptr;
+ struct ifaddrs *ifal, *ifa;
+
+ if (getifaddrs() == -1) {
+ warn("getifaddrs");
+ return NULL;
+ }
+
+ ifihead = NULL;
+ ifipnext =
+
+ for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
+ struct sockaddr *sa = ifa->ifa_addr;
+ int flags = ifa->ifa_flags;
+ int addrflags = ifa->ifa_addrflags;
+
+#if 0
+ /*
+ * Include the loopback so that we return at least one
+ * address, so that mdnsd does not exit before we get
+ * a dhcp address
+ */
+ if (flags & IFF_LOOPBACK)
+ continue; /* ignore loopback interfaces */
+#endif
+
+ if ((flags & IFF_UP) == 0)
+ continue; /* ignore if interface not up */
+
+ if (sa == NULL || sa->sa_family != family)
+ continue; /* ignore if not the desired family */
+
+ switch (sa->sa_family) {
+ case AF_INET:
+ if (addrflags & (IN_IFF_NOTREADY | IN_IFF_DETACHED))
+continue;
+
+ break;
+#if defined(AF_INET6) && HAVE_IPV6
+ case AF_INET6:
+ if (addrflags & (IN6_IFF_NOTREADY | IN6_IFF_DETACHED))
+continue;
+#endif
+ break;
+ default:
+ continue;
+ }
+
+ ifi = calloc(1, sizeof(*ifi));
+ if (ifi == NULL)
+ goto gotError;
+
+ ifipold = *ifipnext; /* need this later */
+ ifiptr= ifipnext;
+ *ifipnext = ifi; /* prev points to new one */
+ ifipnext = >ifi_next; /* pointer to next one */
+
+ ifi->ifi_flags = flags; /* IFF_xxx values */
+ ifi->ifi_myflags = 0; /* IFI_xxx values */
+ ifi->ifi_index = if_nametoindex(ifa->ifa_name);
+ memcpy(ifi->ifi_name, ifa->ifa_name, IFI_NAME);
+ ifi->ifi_name[IFI_NAME-1] = '\0';
+ if (!copyaddr(>ifi_addr, ifa->ifa_addr, sa->sa_len))
+ goto gotError;
+ if (!copyaddr(>ifi_netmask, ifa->ifa_netmask, sa->sa_len))
+ goto gotError;
+
+ if ((flags & IFF_BROADCAST) && !copyaddr(>ifi_brdaddr,
+ ifa->ifa_broadaddr, sa->sa_len))
+ goto gotError;
+ if ((flags & IFF_POINTOPOINT) && !copyaddr(>ifi_dstaddr,
+ ifa->ifa_dstaddr, sa->sa_len))
+ goto gotError;
+ }
+
+ goto done;
+
+gotError:
+ warn("can't allocate
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src
Committed By: christos
Date: Wed May 2 12:12:13 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c
Log Message:
initialize addr to 0.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.4 src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.5
--- src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.4 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c Wed May 2 08:12:13 2018
@@ -44,6 +44,7 @@ mDNSexport void mDNSPlatformSourceAddrFo
int sock = socket(AF_INET, SOCK_DGRAM, 0);
src->type = mDNSAddrType_None;
if (sock == -1) return;
+memset(, 0, sizeof(addr));
if (dst->type == mDNSAddrType_IPv4)
{
inner_len = sizeof(addr.a4);
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: christos Date: Wed May 2 12:12:13 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c Log Message: initialize addr to 0. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: christos
Date: Wed Apr 11 18:34:18 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
Log Message:
Add the missing lock.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.11 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.12
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.11 Sat Mar 3 11:09:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Wed Apr 11 14:34:18 2018
@@ -48,6 +48,7 @@ extern int daemon(int, int);
#include "mDNSUNP.h"// For daemon()
#include "uds_daemon.h"
#include "PlatformCommon.h"
+#include "DNSCommon.h"
#define CONFIG_FILE "/etc/mdnsd.conf"
static domainname DynDNSZone;// Default wide-area zone for service registration
@@ -89,8 +90,10 @@ static void Reconfigure(mDNS *m)
mDNSAddr DynDNSIP;
const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
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");
+mDNS_Unlock(m);
ReadDDNSSettingsFromConfFile(m, CONFIG_FILE, , , NULL);
mDNSPlatformSourceAddrForDest(, );
if (DynDNSHostname.c[0]) mDNS_AddDynDNSHostName(m, , NULL, NULL);
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: christos Date: Wed Apr 11 18:34:18 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c Log Message: Add the missing lock. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: christos
Date: Wed Apr 11 18:33:21 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c
Log Message:
instead of short-circuiting the test, set auto target host on by default.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.10 src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.11
--- src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.10 Sat Apr 7 15:13:27 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Wed Apr 11 14:33:21 2018
@@ -12577,13 +12577,11 @@ mDNSlocal void AdvertiseInterface(mDNS *
NetworkInterfaceInfo *primary;
mDNSu8 recordType;
-#if 0
if (m->AutoTargetServices == 0)
{
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
@@ -14479,7 +14477,7 @@ mDNSlocal mStatus mDNS_InitStorage(mDNS
m->WABBrowseQueriesCount= 0;
m->WABLBrowseQueriesCount = 0;
m->WABRegQueriesCount = 0;
-m->AutoTargetServices = 0;
+m->AutoTargetServices = 1;
#if BONJOUR_ON_DEMAND
m->NumAllInterfaceRecords = 0;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: christos Date: Wed Apr 11 18:33:21 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c Log Message: instead of short-circuiting the test, set auto target host on by default. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: christos
Date: Wed Apr 11 18:33:48 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c
DNSCommon.h mDNSEmbeddedAPI.h
Log Message:
Add the location of the last lock to help debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
cvs rdiff -u -r1.1.1.5 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.8 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.8 Sun Jan 14 15:04:55 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Wed Apr 11 14:33:48 2018
@@ -3838,7 +3838,7 @@ mDNSexport mStatus mDNSSendDNSMessage(mD
#pragma mark - RR List Management & Task Management
#endif
-mDNSexport void mDNS_Lock_(mDNS *const m, const char * const functionname)
+mDNSexport void mDNS_Lock_(mDNS *const m, const char * const functionname, int lineno)
{
// MUST grab the platform lock FIRST!
mDNSPlatformLock(m);
@@ -3848,20 +3848,20 @@ mDNSexport void mDNS_Lock_(mDNS *const m
// 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)
-LogFatalError("%s: mDNS_Lock: Locking failure! mDNS_busy (%ld) != mDNS_reentrancy (%ld)", functionname, m->mDNS_busy, m->mDNS_reentrancy);
+LogFatalError("%s,%d: mDNS_Lock: Locking failure! mDNS_busy (%ld) != mDNS_reentrancy (%ld) (last %s,%d)", functionname, lineno, m->mDNS_busy, m->mDNS_reentrancy, m->mDNS_Lock_functionname, m->mDNS_Lock_lineno);
// 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));
+LogMsg("%s,%d: mDNS_Lock: m->timenow already set (%ld/%ld)", functionname, lineno, 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);
+LogMsg("%s,%d: mDNS_Lock: m->mDNS_busy is %ld but m->timenow not set", functionname, lineno, m->mDNS_busy);
m->timenow = mDNS_TimeNow_NoLock(m);
if (m->timenow == 0) m->timenow = 1;
}
@@ -3869,13 +3869,15 @@ mDNSexport void mDNS_Lock_(mDNS *const m
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);
+LogMsg("%s,%d: mDNSPlatformRawTime went backwards by %ld ticks; setting correction factor to %ld", functionname, lineno, 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++;
+m->mDNS_Lock_functionname = functionname;
+m->mDNS_Lock_lineno = lineno;
}
mDNSlocal AuthRecord *AnyLocalRecordReady(const mDNS *const m)
@@ -4011,20 +4013,21 @@ mDNSexport void ShowTaskSchedulingError(
mDNS_Unlock(m);
}
-mDNSexport void mDNS_Unlock_(mDNS *const m, const char *const functionname)
+mDNSexport void mDNS_Unlock_(mDNS *const m, const char *const functionname, int lineno)
{
// Decrement mDNS_busy
m->mDNS_busy--;
// Check for locking failures
if (m->mDNS_busy != m->mDNS_reentrancy)
-LogFatalError("%s: mDNS_Unlock: Locking failure! mDNS_busy (%ld) != mDNS_reentrancy (%ld)", functionname, m->mDNS_busy, m->mDNS_reentrancy);
+LogFatalError("%s,%d: mDNS_Unlock: Locking failure! mDNS_busy (%ld) != mDNS_reentrancy (%ld) (last %s,%d)", functionname, lineno, m->mDNS_busy,
+ m->mDNS_reentrancy, m->mDNS_Lock_functionname, m->mDNS_Lock_lineno);
// 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);
+if (m->timenow == 0)
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: christos Date: Wed Apr 11 18:33:48 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c DNSCommon.h mDNSEmbeddedAPI.h Log Message: Add the location of the last lock to help debugging. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h cvs rdiff -u -r1.1.1.5 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: christos Date: Sat Apr 7 19:18:16 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Log Message: put back handling for SIOCGIFAFLAG_IN -- should not matter. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: christos
Date: Sat Apr 7 19:18:16 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c
Log Message:
put back handling for SIOCGIFAFLAG_IN -- should not matter.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.9 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.10
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.9 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Sat Apr 7 15:18:16 2018
@@ -303,6 +303,36 @@ struct ifi_info *get_ifi_info(int family
if ((flags & IFF_UP) == 0)
continue; /* ignore if interface not up */
+ if ((flags & IFF_LOOPBACK))
+ continue; /* ignore loopback interfaces */
+
+ /* Skip addresses we can't use */
+#ifdef SIOCGIFAFLAG_IN
+ if (ifr->ifr_addr.sa_family == AF_INET) {
+ ifrcopy = *ifr;
+ if (ioctl(sockfd, SIOCGIFAFLAG_IN, ) < 0)
+ goto gotError;
+ if (ifrcopy.ifr_addrflags & (IN_IFF_NOTREADY | IN_IFF_DETACHED))
+ continue;
+ }
+#endif
+#ifdef SIOCGIFAFLAG_IN6
+if (ifr->ifr_addr.sa_family == AF_INET6) {
+ struct in6_ifreq ifr6;
+
+ if (sockf6 == -1)
+ sockf6 = socket(AF_INET6, SOCK_DGRAM, 0);
+ memset(, 0, sizeof(ifr6));
+ memcpy(_name, >ifr_name, sizeof(ifr6.ifr_name));
+ memcpy(_addr, >ifr_addr, sizeof(ifr6.ifr_addr));
+ if (ioctl(sockf6, SIOCGIFAFLAG_IN6, ) < 0)
+ goto gotError;
+ if (ifr6.ifr_ifru.ifru_flags6 &
+ (IN6_IFF_NOTREADY | IN6_IFF_DETACHED))
+ continue;
+ }
+#endif
+
ifi = (struct ifi_info*)calloc(1, sizeof(struct ifi_info));
if (ifi == NULL) {
goto gotError;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: christos
Date: Sat Apr 7 19:13:27 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c
Log Message:
When we advertise interfaces, don't skip if we are not autotargetting services
yet. It is the chicken and the egg problem.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.9 src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.10
--- src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.9 Sun Feb 25 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Sat Apr 7 15:13:27 2018
@@ -12577,11 +12577,13 @@ mDNSlocal void AdvertiseInterface(mDNS *
NetworkInterfaceInfo *primary;
mDNSu8 recordType;
+#if 0
if (m->AutoTargetServices == 0)
{
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
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: christos Date: Sat Apr 7 19:13:27 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c Log Message: When we advertise interfaces, don't skip if we are not autotargetting services yet. It is the chicken and the egg problem. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: christos
Date: Sat Apr 7 19:09:12 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNSDebug.h
Log Message:
Allow overriding checking for debug functions
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h:1.1.1.4 src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h:1.1.1.4 Sun Jan 14 14:40:51 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h Sat Apr 7 15:09:12 2018
@@ -34,7 +34,9 @@
//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)
+#ifndef MDNS_CHECK_PRINTF_STYLE_FUNCTIONS
#define MDNS_CHECK_PRINTF_STYLE_FUNCTIONS 0
+#endif
typedef enum
{
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: christos Date: Sat Apr 7 19:09:12 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: mDNSDebug.h Log Message: Allow overriding checking for debug functions To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src
Committed By: christos
Date: Sat Mar 3 16:09:56 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientlib.c
Log Message:
Fix Reproducible builds by obeying MDNS_VERSIONSTR_NODTS in all cases.
Reported by wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c
diff -u src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.6 src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.7
--- src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.6 Sun Jan 14 15:04:55 2018
+++ src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c Sat Mar 3 11:09:56 2018
@@ -2288,7 +2288,12 @@ Fail:
// 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__ ")";
+const char VersionString_SCCS[] = "@(#) dns-sd "
+STRINGIFY(mDNSResponderVersion)
+#ifndef MDNS_VERSIONSTR_NODTS
+" (" __DATE__ " " __TIME__ ")"
+#endif
+;
#if _BUILDING_XCODE_PROJECT_
// If the process crashes, then this string will be magically included in the automatically-generated crash log
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.10 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.11
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.10 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Sat Mar 3 11:09:56 2018
@@ -249,9 +249,15 @@ asm (".desc ___crashreporter_info__, 0x1
// 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)";
+mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder-" STRINGIFY(mDNSResponderVersion)
+#ifndef MDNS_VERSIONSTR_NODTS
+" (" __DATE__ " " __TIME__ ")"
+#endif
+;
#else
-mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder (Engineering Build) (" __DATE__ " " __TIME__ ")";
+mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder (Engineering Build)"
+#ifndef MDNS_VERSIONSTR_NODTS
+" (" __DATE__ " " __TIME__ ")"
+#endif
+;
#endif
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.5 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.6
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.5 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c Sat Mar 3 11:09:56 2018
@@ -363,4 +363,10 @@ DNSServiceErrorType DNSSD_API TXTRecordG
// 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__ ")";
+const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd "
+STRINGIFY(mDNSResponderVersion)
+#ifndef MDNS_VERSIONSTR_NODTS
+" (" __DATE__ " " __TIME__ ")"
+#endif
+;
+
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: christos Date: Sat Mar 3 16:09:56 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientlib.c Log Message: Fix Reproducible builds by obeying MDNS_VERSIONSTR_NODTS in all cases. Reported by wiz@ To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c cvs rdiff -u -r1.10 -r1.11 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: christos Date: Sun Feb 25 21:06:40 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: mDNSResponder.8 Log Message: update upstream code changes in signal handling. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8 diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8:1.1.1.4 src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8:1.2 --- src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8:1.1.1.4 Sun Jan 14 14:40:51 2018 +++ src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8 Sun Feb 25 16:06:40 2018 @@ -14,7 +14,7 @@ .\" See the License for the specific language governing permissions and .\" limitations under the License. .\" -.Dd April 2004 \" Date +.Dd Feb 25, 2018 \" Date .Dt mDNSResponder 8 \" Document Title .Os Darwin \" Operating System .\" @@ -61,23 +61,24 @@ logging levels map as follows: .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 +.\" 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 +.\" A SIGUSR2 signal toggles packet logging: +.\" .Pp +.\" .Dl % sudo killall -USR2 mDNSResponder +.Pp +A SIGUSR1 signal will dump a snapshot summary of the internal state to +.\" .Pa /var/log/system.log Ns : +.Xr syslog 8 . .Pp .Dl % sudo killall -INFO mDNSResponder .Sh OPTIONAL ARGUMENTS
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: christos Date: Sun Feb 25 21:06:40 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: mDNSResponder.8 Log Message: update upstream code changes in signal handling. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: christos Date: Sun Feb 25 19:22:42 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c Log Message: zero out socket structures before bind. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: christos
Date: Sun Feb 25 19:22:42 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
Log Message:
zero out socket structures before bind.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.13 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.14
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.13 Wed Jan 17 01:10:27 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Sun Feb 25 14:22:41 2018
@@ -745,6 +745,10 @@ mDNSlocal int SetupSocket(struct sockadd
// And start listening for packets
if (err == 0)
{
+ mDNSPlatformMemZero(, sizeof(bindAddr));
+#ifndef NOT_HAVE_SA_LEN
+ bindAddr.sin_len = sizeof(bindAddr);
+#endif
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
@@ -1054,6 +1058,9 @@ mDNSlocal mStatus OpenIfNotifySocket(int
/* Subscribe the socket to Link & IP addr notifications. */
mDNSPlatformMemZero(, sizeof snl);
+#ifndef NOT_HAVE_SA_LEN
+snl.nl_len= sizeof(snl);
+#endif
snl.nl_family = AF_NETLINK;
snl.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
ret = bind(sock, (struct sockaddr *) , sizeof snl);
@@ -1266,6 +1273,11 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR
int err;
int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
struct sockaddr_in s5353;
+
+mDNSPlatformMemZero(, sizeof(s5353));
+#ifndef NOT_HAVE_SA_LEN
+s5353.sin_len = sizeof(s5353);
+#endif
s5353.sin_family = AF_INET;
s5353.sin_port= MulticastDNSPort.NotAnInteger;
s5353.sin_addr.s_addr = 0;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src
Committed By: christos
Date: Sun Feb 4 20:38:41 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c
uds_daemon.c
Log Message:
optval is int not long
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c \
src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.10 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.11
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.10 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Sun Feb 4 15:38:41 2018
@@ -552,7 +552,7 @@ static DNSServiceErrorType ConnectToServ
else
{
#ifdef SO_NOSIGPIPE
-const unsigned long optval = 1;
+const unsigned int optval = 1;
#endif
#ifndef USE_TCP_LOOPBACK
char* uds_serverpath = getenv(MDNS_UDS_SERVERPATH_ENVVAR);
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.10 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.11
--- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.10 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Sun Feb 4 15:38:41 2018
@@ -4978,7 +4978,7 @@ mDNSlocal void connect_callback(int fd,
dnssd_socklen_t len = (dnssd_socklen_t) sizeof(cliaddr);
dnssd_sock_t sd = accept(fd, (struct sockaddr*) , );
#if defined(SO_NOSIGPIPE) || defined(_WIN32)
-unsigned long optval = 1;
+unsigned int optval = 1;
#endif
(void)filter; // Unused
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: christos Date: Sun Feb 4 20:38:41 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c uds_daemon.c Log Message: optval is int not long To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src
Committed By: christos
Date: Wed Jan 17 06:10:28 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNSEmbeddedAPI.h
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
mDNSUNP.h
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_ipc.h
Log Message:
make lint compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h:1.6 src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h:1.7
--- src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h:1.6 Sun Jan 14 15:04:55 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h Wed Jan 17 01:10:27 2018
@@ -2602,7 +2602,7 @@ extern mDNSu8 NumUnreachableDNSServers;
#if (defined(_MSC_VER))
#define mDNSinline static __inline
-#elif ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 9)))
+#elif ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 9))) || defined(__lint__)
#define mDNSinline static inline
#endif
@@ -3562,6 +3562,7 @@ extern int MD5_Final(unsigned char *md,
struct CompileTimeAssertionChecks_mDNS
{
+#ifndef __lint__
// 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];
@@ -3613,6 +3614,7 @@ struct CompileTimeAssertionChecks_mDNS
#if APPLE_OSX_mDNSResponder
char sizecheck_ClientTunnel[(sizeof(ClientTunnel) <= 1256) ? 1 : -1];
#endif
+#endif
};
// Routine to initialize device-info TXT record contents
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.12 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.13
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.12 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Wed Jan 17 01:10:27 2018
@@ -1455,7 +1455,7 @@ mDNSexport int mDNSPlatformMemCmp(const
mDNSexport void mDNSPlatformQsort(void *base, int nel, int width, int (*compar)(const void *, const void *))
{
-return (qsort(base, nel, width, compar));
+qsort(base, nel, width, compar);
}
// DNSSEC stub functions
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h:1.1.1.3 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h:1.1.1.3 Sun Jan 14 13:43:02 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h Wed Jan 17 01:10:27 2018
@@ -101,7 +101,7 @@ struct ifi_info {
extern struct ifi_info *get_ifi_info_linuxv6(int family, int doaliases);
#endif
-#if defined(AF_INET6) && HAVE_IPV6
+#if defined(AF_INET6) && HAVE_IPV6 && !defined(INET6_ADDRSTRLEN)
#define INET6_ADDRSTRLEN 46 /*Maximum length of IPv6 address */
#endif
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.6 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.7
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.6 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h Wed Jan 17 01:10:28 2018
@@ -213,8 +213,10 @@ struct CompileTimeAssertionChecks_dnssd_
{
// 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.
+#ifndef __lint__
char assert0[(sizeof(client_context_t) == 8) ? 1 : -1];
char assert1[(sizeof(ipc_msg_hdr) == 28) ? 1 : -1];
+#endif
};
#endif // DNSSD_IPC_H
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: christos Date: Wed Jan 17 06:10:28 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: mDNSEmbeddedAPI.h src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c mDNSUNP.h src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_ipc.h Log Message: make lint compile again. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h cvs rdiff -u -r1.12 -r1.13 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c cvs rdiff -u -r1.1.1.3 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: christos Date: Sun Jan 14 20:04:56 UTC 2018 Modified Files: src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c DNSDigest.c mDNS.c mDNSEmbeddedAPI.h uDNS.c src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c mDNSPosix.c mDNSUNP.c src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c dns-sd.1 dns_sd.h dnssd_clientlib.c dnssd_clientstub.c dnssd_ipc.h uds_daemon.c Log Message: resolve conflicts To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c cvs rdiff -u -r1.7 -r1.8 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSDigest.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h cvs rdiff -u -r1.2 -r1.3 \ src/external/apache2/mDNSResponder/dist/mDNSCore/uDNS.c cvs rdiff -u -r1.9 -r1.10 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c cvs rdiff -u -r1.11 -r1.12 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c cvs rdiff -u -r1.8 -r1.9 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c cvs rdiff -u -r1.3 -r1.4 \ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h cvs rdiff -u -r1.9 -r1.10 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: joerg Date: Fri Jul 21 08:49:05 UTC 2017 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c Log Message: Fix format strings to reflect exactly the types used. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: joerg Date: Fri Jul 21 08:49:05 UTC 2017 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c Log Message: Fix format strings to reflect exactly the types used. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.7 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.8 --- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.7 Mon Mar 31 23:26:30 2014 +++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Fri Jul 21 08:49:05 2017 @@ -177,8 +177,8 @@ static int write_all(dnssd_sock_t sd, ch else syslog(LOG_INFO, "dnssd_clientstub write_all(%d) DEFUNCT", sd); #else - syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %zd/%ld %d %s", sd, -(long)num_written, (long)len, + syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %zd/%zu %d %s", sd, +num_written, len, (num_written < 0) ? dnssd_errno : 0, (num_written < 0) ? dnssd_strerror(dnssd_errno) : ""); #endif
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: roy Date: Thu Oct 15 10:24:33 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c Log Message: Revert r1.5 now that the time calculations are using a monotonic clock. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: roy
Date: Thu Oct 15 10:24:33 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c
Log Message:
Revert r1.5 now that the time calculations are using a monotonic clock.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.5 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.6
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.5 Tue Nov 25 02:29:57 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Thu Oct 15 10:24:33 2015
@@ -2697,7 +2697,7 @@ mDNSexport void mDNS_Lock_(mDNS *const m
if (m->timenow_last - m->timenow > 0)
{
m->timenow_adjust += m->timenow_last - m->timenow;
- debugf("%s: mDNSPlatformRawTime went backwards by %ld ticks; setting correction factor to %ld", functionname, m->timenow_last - m->timenow, m->timenow_adjust);
+ 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;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: roy
Date: Thu Oct 15 10:29:57 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c
Log Message:
If scheduling a probe or response is in the past or exactly now, schedule
it for now + 1 to avoid log file spam about not all probes being sent.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.4 src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.5
--- src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.4 Mon Mar 31 23:26:30 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Thu Oct 15 10:29:57 2015
@@ -687,14 +687,18 @@ mDNSlocal void SetNextAnnounceProbeTime(
// 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: mDNS: Sometimes advertising stops working and record interval is set to zero
- if (m->NextScheduledProbe - m->timenow < 0)
- m->NextScheduledProbe = m->timenow;
+ // A future time also needs to be set to avoid spamming logs about not all probes being sent.
+ if (m->NextScheduledProbe - m->timenow <= 0)
+ m->NextScheduledProbe = m->timenow + 1;
}
else if (rr->AnnounceCount && (ResourceRecordIsValidAnswer(rr) || rr->resrec.RecordType == kDNSRecordTypeDeregistering))
{
if (m->NextScheduledResponse - (rr->LastAPTime + rr->ThisAPInterval) >= 0)
m->NextScheduledResponse = (rr->LastAPTime + rr->ThisAPInterval);
}
+ // A future time also needs to be set to avoid spamming logs about not all responses being sent.
+ if (m->NextScheduledResponse - m->timenow <= 0)
+ m->NextScheduledResponse = m->timenow + 1;
}
mDNSlocal void InitializeLastAPTime(mDNS *const m, AuthRecord *const rr)
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Thu Oct 15 10:15:19 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c Log Message: Starting and stopping should be informational messages to avoid console spam. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: roy
Date: Thu Oct 15 10:15:19 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
Log Message:
Starting and stopping should be informational messages to avoid console
spam.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.6 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.7
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.6 Mon Mar 24 00:31:13 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Thu Oct 15 10:15:18 2015
@@ -232,7 +232,7 @@ int main(int argc, char **argv)
ParseCmdLinArgs(argc, argv);
- LogMsg("%s starting", mDNSResponderVersionString);
+ LogInfo("%s starting", mDNSResponderVersionString);
err = mDNS_Init(, , gRRCache, RR_CACHE_SIZE, mDNS_Init_AdvertiseLocalAddresses,
mDNS_StatusCallback, mDNS_Init_NoInitCallbackContext);
@@ -265,7 +265,7 @@ int main(int argc, char **argv)
if (mStatus_NoError == err)
err = MainLoop();
- LogMsg("%s stopping", mDNSResponderVersionString);
+ LogInfo("%s stopping", mDNSResponderVersionString);
mDNS_Close();
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: roy Date: Thu Oct 15 10:29:57 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c Log Message: If scheduling a probe or response is in the past or exactly now, schedule it for now + 1 to avoid log file spam about not all probes being sent. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src
Committed By: roy
Date: Thu Oct 15 11:21:53 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c
Log Message:
Derive our primary interface and address by trying to connect to an
address in the TEST-NET-2 network as noted in RFC5737 instead of using
the 1.1.1.1 address. Also, use port 7 (echo) for better style.
Fixes PR bin/46758 thanks to Lloyd Parkes.
While here, if we do fail to connect to the test address, don't spam
this to the console as it's a common case during the boot sequence.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.7 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.8
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.7 Thu Oct 15 10:15:18 2015
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Thu Oct 15 11:21:53 2015
@@ -92,7 +92,8 @@ mDNSlocal void mDNS_StatusCallback(mDNS
static void Reconfigure(mDNS *m)
{
mDNSAddr DynDNSIP;
- const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
+ // Use a random address from TEST-NET-2 in RFC5737
+ const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 198, 51, 100, 42 } } } };;
mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
mDNS_Lock(m);
if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0)
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.1.1.3 src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c:1.1.1.3 Mon Mar 31 23:21:22 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c Thu Oct 15 11:21:53 2015
@@ -47,7 +47,7 @@ mDNSexport void mDNSPlatformSourceAddrFo
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_port= 7; // Not important, any port will do
addr.a4.sin_addr.s_addr = dst->ip.v4.NotAnInteger;
}
else if (dst->type == mDNSAddrType_IPv6)
@@ -58,14 +58,26 @@ mDNSexport void mDNSPlatformSourceAddrFo
#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_port = 7; // Not important, any port will do
addr.a6.sin6_addr = *(struct in6_addr*)>ip.v6;
addr.a6.sin6_scope_id = 0;
}
else return;
if ((connect(sock, , inner_len)) < 0)
- { LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno)); goto exit; }
+ {
+ static mDNSv4Addr dummy = { 198, 51, 100, 42 };
+
+ // Don't spam if we can't connect to 198.51.100.42 to the console.
+ // That is our test address to out which interfaces/address should be primary and is also
+ // configured in mDNSPosix/PosixDaemon.c:Reconfigure()
+ // Failing to connect to it with EADDRNOTAVAIL is a common situation, especially on boot up.
+ if (dst->type == mDNSAddrType_IPv4 && dst->ip.v4.NotAnInteger == dummy.NotAnInteger && errno == EADDRNOTAVAIL)
+ LogInfo("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
+ else
+ LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno));
+ goto exit;
+ }
if ((getsockname(sock, , )) < 0)
{ LogMsg("mDNSPlatformSourceAddrForDest: getsockname failed errno %d (%s)", errno, strerror(errno)); goto exit; }
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: roy Date: Thu Oct 15 11:21:53 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c Log Message: Derive our primary interface and address by trying to connect to an address in the TEST-NET-2 network as noted in RFC5737 instead of using the 1.1.1.1 address. Also, use port 7 (echo) for better style. Fixes PR bin/46758 thanks to Lloyd Parkes. While here, if we do fail to connect to the test address, don't spam this to the console as it's a common case during the boot sequence. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c cvs rdiff -u -r1.1.1.3 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: roy
Date: Thu Oct 15 16:14:40 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
Log Message:
Add support for parsing IPv6 nameservers found in resolv.conf.
Fixes PR bin/42196.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.9 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.10
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.9 Mon Oct 12 09:29:25 2015
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Thu Oct 15 16:14:40 2015
@@ -494,10 +494,11 @@ mDNSexport int ParseDNSServers(mDNS *m,
while (fgets(line,sizeof(line),fp))
{
struct in_addr ina;
+ struct in6_addr ina6;
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 *)) != 0)
+ if (inet_pton(AF_INET, nameserver, ) == 1)
{
mDNSAddr DNSAddr;
DNSAddr.type = mDNSAddrType_IPv4;
@@ -505,7 +506,15 @@ mDNSexport int ParseDNSServers(mDNS *m,
mDNS_AddDNSServer(m, NULL, mDNSInterface_Any, , UnicastDNSPort, mDNSfalse, 0);
numOfServers++;
}
- }
+ else if (inet_pton(AF_INET6, nameserver, ) == 1)
+ {
+ mDNSAddr DNSAddr;
+ DNSAddr.type = mDNSAddrType_IPv6;
+ DNSAddr.ip.v6 = *(mDNSv6Addr *)
+ mDNS_AddDNSServer(m, NULL, mDNSInterface_Any, , UnicastDNSPort, mDNSfalse, 0);
+ numOfServers++;
+ }
+ }
fclose(fp);
return (numOfServers > 0) ? 0 : -1;
}
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Thu Oct 15 16:14:40 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c Log Message: Add support for parsing IPv6 nameservers found in resolv.conf. Fixes PR bin/42196. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: roy
Date: Thu Oct 15 15:58:34 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c
Log Message:
Revert prior. Instead just send the diagnostic to debugf instead of syslog as
it's not really that interesting.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.5 src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.6
--- src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.5 Thu Oct 15 10:29:57 2015
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Thu Oct 15 15:58:34 2015
@@ -687,18 +687,16 @@ mDNSlocal void SetNextAnnounceProbeTime(
// 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: mDNS: Sometimes advertising stops working and record interval is set to zero
- // A future time also needs to be set to avoid spamming logs about not all probes being sent.
- if (m->NextScheduledProbe - m->timenow <= 0)
- m->NextScheduledProbe = m->timenow + 1;
+ 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);
}
- // A future time also needs to be set to avoid spamming logs about not all responses being sent.
- if (m->NextScheduledResponse - m->timenow <= 0)
- m->NextScheduledResponse = m->timenow + 1;
+ if (m->NextScheduledResponse - m->timenow < 0)
+ m->NextScheduledResponse = m->timenow;
}
mDNSlocal void InitializeLastAPTime(mDNS *const m, AuthRecord *const rr)
@@ -4499,7 +4497,7 @@ mDNSexport mDNSs32 mDNS_Execute(mDNS *co
}
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",
+debugf("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;
}
@@ -4508,7 +4506,7 @@ mDNSexport mDNSs32 mDNS_Execute(mDNS *co
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");
+debugf("mDNS_Execute: SendResponses didn't send all its responses; will try again in one second");
m->NextScheduledResponse = m->timenow + mDNSPlatformOneSecond;
}
}
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: roy Date: Thu Oct 15 15:58:34 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c Log Message: Revert prior. Instead just send the diagnostic to debugf instead of syslog as it's not really that interesting. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: roy
Date: Mon Oct 12 09:29:25 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
Log Message:
A lack of useable addresses on any interfaces is not an error.
More interfaces and/or useable addresses could be added later.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.8 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.9
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.8 Mon Oct 12 09:26:38 2015
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Mon Oct 12 09:29:25 2015
@@ -921,7 +921,9 @@ mDNSlocal int SetupInterfaceList(mDNS *c
assert(m != NULL);
debugf("SetupInterfaceList");
- if (intfList == NULL) err = ENOENT;
+ /* More interfaces, or usableable addresses to existing interfaces
+ * could be added later. */
+ if (intfList == NULL) return 0;
#if HAVE_IPV6
if (err == 0) /* Link the IPv6 list to the end of the IPv4 list */
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Mon Oct 12 09:29:25 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c Log Message: A lack of useable addresses on any interfaces is not an error. More interfaces and/or useable addresses could be added later. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: roy
Date: Mon Oct 12 09:26:38 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
Log Message:
Use clock_gettime as a more accurate time source.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.7 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.8
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.7 Sat Dec 20 13:15:48 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Mon Oct 12 09:26:38 2015
@@ -1411,6 +1411,11 @@ mDNSexport mStatus mDNSPlatformTimeInit(
mDNSexport mDNSs32 mDNSPlatformRawTime()
{
+#ifdef CLOCK_MONOTONIC
+ struct timespec tv;
+ clock_gettime(CLOCK_MONOTONIC, );
+ return((tv.tv_sec << 10) | ((tv.tv_nsec / 1000) * 16 / 15625));
+#else
struct timeval tv;
gettimeofday(, NULL);
// tv.tv_sec is seconds since 1st January 1970 (GMT, with no adjustment for daylight savings time)
@@ -1420,6 +1425,7 @@ mDNSexport mDNSs32 mDNSPlatformRawTime(
// 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));
+#endif
}
mDNSexport mDNSs32 mDNSPlatformUTC(void)
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Mon Oct 12 09:26:38 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c Log Message: Use clock_gettime as a more accurate time source. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Mon Oct 12 09:28:15 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Log Message: Ignore loopback interfaces To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Mon Oct 12 09:28:15 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Log Message: Ignore loopback interfaces To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.6 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.7 --- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.6 Wed Jun 10 16:32:42 2015 +++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Mon Oct 12 09:28:15 2015 @@ -277,6 +277,8 @@ struct ifi_info *get_ifi_info(int family flags = ifrcopy.ifr_flags; if ((flags & IFF_UP) == 0) continue; /* ignore if interface not up */ + if ((flags & IFF_LOOPBACK)) + continue; /* ignore loopback interfaces */ /* Skip addresses we can't use */ #ifdef SIOCGIFAFLAG_IN
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: roy
Date: Wed Jun 10 16:32:43 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c
Log Message:
Teach mdnsd about IN_IFF_NOTREADY and IN_IFF_DETACHED.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.5 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.6
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.5 Fri Jan 16 20:16:36 2015
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Wed Jun 10 16:32:42 2015
@@ -279,6 +279,15 @@ struct ifi_info *get_ifi_info(int family
continue; /* ignore if interface not up */
/* Skip addresses we can't use */
+#ifdef SIOCGIFAFLAG_IN
+ if (ifr-ifr_addr.sa_family == AF_INET) {
+ ifrcopy = *ifr;
+ if (ioctl(sockfd, SIOCGIFAFLAG_IN, ifrcopy) 0)
+ goto gotError;
+ if (ifrcopy.ifr_addrflags (IN_IFF_NOTREADY | IN_IFF_DETACHED))
+ continue;
+ }
+#endif
#ifdef SIOCGIFAFLAG_IN6
if (ifr-ifr_addr.sa_family == AF_INET6) {
struct in6_ifreq ifr6;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Wed Jun 10 16:32:43 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Log Message: Teach mdnsd about IN_IFF_NOTREADY and IN_IFF_DETACHED. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: christos Date: Fri Jan 16 20:16:37 UTC 2015 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Log Message: use calloc, remove cast. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: christos
Date: Fri Jan 16 20:16:37 UTC 2015
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c
Log Message:
use calloc, remove cast.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.4 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.5
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.4 Sun Mar 23 20:31:13 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Fri Jan 16 15:16:36 2015
@@ -221,7 +221,7 @@ struct ifi_info *get_ifi_info(int family
lastlen = 0;
len = 100 * sizeof(struct ifreq); /* initial buffer size guess */
for ( ; ; ) {
-buf = (char*)malloc(len);
+buf = calloc(len, 1);
if (buf == NULL) {
goto gotError;
}
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: jmcneill
Date: Tue Nov 25 02:29:57 UTC 2014
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c
Log Message:
Change the mDNSPlatformRawTime went backwards message from LogMsg to
debugf. It's not that interesting, as it is comparing the results of two
gettimeofday() calls.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.4 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.5
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.4 Mon Mar 31 23:26:30 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Tue Nov 25 02:29:57 2014
@@ -2697,7 +2697,7 @@ mDNSexport void mDNS_Lock_(mDNS *const m
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);
+ debugf(%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;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: jmcneill Date: Tue Nov 25 02:29:57 UTC 2014 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c Log Message: Change the mDNSPlatformRawTime went backwards message from LogMsg to debugf. It's not that interesting, as it is comparing the results of two gettimeofday() calls. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: pettai Date: Mon Mar 31 23:26:30 UTC 2014 Modified Files: src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c DNSDigest.c mDNS.c mDNSEmbeddedAPI.h src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c src/external/apache2/mDNSResponder/dist/mDNSShared: dns_sd.h dnssd_clientstub.c dnssd_ipc.h uds_daemon.c Log Message: Import mDNSResponder-320.16, merge, fix conflicts To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c cvs rdiff -u -r1.3 -r1.4 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSDigest.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c cvs rdiff -u -r1.3 -r1.4 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c cvs rdiff -u -r1.7 -r1.8 \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: pettai Date: Fri Mar 28 07:01:49 UTC 2014 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c uds_daemon.c Log Message: Fix lost merges To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.5 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.6 --- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.5 Mon Mar 24 00:31:13 2014 +++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Fri Mar 28 07:01:49 2014 @@ -165,14 +165,14 @@ static int write_all(dnssd_sock_t sd, ch 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, +syslog(LOG_WARNING, dnssd_clientstub write_all(%d) failed %zd/%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, + syslog(LOG_WARNING, dnssd_clientstub write_all(%d) failed %zd/%ld %d %s, sd, (long)num_written, (long)len, (num_written 0) ? dnssd_errno : 0, (num_written 0) ? dnssd_strerror(dnssd_errno) : ); Index: src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.6 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.7 --- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.6 Mon Mar 24 00:31:13 2014 +++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Fri Mar 28 07:01:49 2014 @@ -3256,7 +3256,9 @@ mDNSlocal void connect_callback(int fd, 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) +#if defined(SO_NOSIGPIPE) + int optval = 1; +#elif defined(_WIN32) unsigned long optval = 1; #endif
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: pettai Date: Fri Mar 28 07:01:49 UTC 2014 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c uds_daemon.c Log Message: Fix lost merges To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c cvs rdiff -u -r1.6 -r1.7 \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: pettai Date: Mon Mar 24 00:31:13 UTC 2014 Modified Files: src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c DNSDigest.c mDNS.c mDNSEmbeddedAPI.h src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c mDNSPosix.c mDNSUNP.c src/external/apache2/mDNSResponder/dist/mDNSShared: dns-sd.1 dns_sd.h dnssd_clientlib.c dnssd_clientstub.c dnssd_ipc.h uds_daemon.c Log Message: Import mDNSResponder-258.14, merge, fix conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c cvs rdiff -u -r1.2 -r1.3 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSDigest.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c cvs rdiff -u -r1.3 -r1.4 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c cvs rdiff -u -r1.2 -r1.3 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c cvs rdiff -u -r1.5 -r1.6 \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: roy
Date: Sat Jan 18 16:51:44 UTC 2014
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c
Log Message:
Don't try and use an address we can't use.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.2 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.3
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.2 Tue Sep 29 23:56:28 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Sat Jan 18 16:51:44 2014
@@ -411,6 +411,24 @@ struct ifi_info *get_ifi_info(int family
if ((flags IFF_UP) == 0)
continue; /* ignore if interface not up */
+ /* Skip addresses we can't use */
+#ifdef SIOCGIFAFLAG_IN6
+if (ifr-ifr_addr.sa_family == AF_INET6) {
+ 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_addr, ifr-ifr_addr, sizeof(ifr6.ifr_addr));
+ if (ioctl(sockf6, SIOCGIFAFLAG_IN6, ifr6) 0)
+ goto gotError;
+ if (ifr6.ifr_ifru.ifru_flags6
+ (IN6_IFF_NOTREADY | IN6_IFF_DETACHED))
+ continue;
+ }
+#endif
+
ifi = (struct ifi_info*)calloc(1, sizeof(struct ifi_info));
if (ifi == NULL) {
goto gotError;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src Committed By: roy Date: Sat Jan 18 16:51:44 UTC 2014 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSUNP.c Log Message: Don't try and use an address we can't use. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: roy Date: Thu Nov 14 08:26:54 UTC 2013 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: uds_daemon.c Log Message: Fix setsockopt(2) error. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.4 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.5 --- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.4 Mon May 23 22:39:25 2011 +++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Thu Nov 14 08:26:54 2013 @@ -3852,8 +3852,10 @@ mDNSlocal void connect_callback(int fd, 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) - const unsigned long optval = 1; +#if defined(SO_NOSIGPIPE) + int optval = 1; +#elif defined(_WIN32) + unsigned long optval = 1; #endif (void)filter; // Unused
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src
Committed By: taca
Date: Mon Sep 24 14:17:56 UTC 2012
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c
Log Message:
Fix setsockopt(2) error on 64bit environment (amd64).
Reported by PR lib/46693 by me and OK'ed by dholland@.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.3 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.4
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.3 Tue May 24 15:44:28 2011
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Mon Sep 24 14:17:56 2012
@@ -636,7 +636,7 @@ static DNSServiceErrorType ConnectToServ
else
{
#ifdef SO_NOSIGPIPE
- const unsigned long optval = 1;
+ int optval = 1;
#endif
*ref = NULL;
sdr-sockfd= socket(AF_DNSSD, SOCK_STREAM, 0);
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: taca Date: Mon Sep 24 14:17:56 UTC 2012 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c Log Message: Fix setsockopt(2) error on 64bit environment (amd64). Reported by PR lib/46693 by me and OK'ed by dholland@. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src
Committed By: joerg
Date: Tue Jun 7 20:04:32 UTC 2011
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c
Log Message:
Add () that match operator order.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c:1.1.1.1 Tue Sep 29 22:14:11 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Tue Jun 7 20:04:32 2011
@@ -3594,7 +3594,7 @@
// go through our interface list sending the appropriate queries on each interface
while (intf)
{
- const int os = !intf-MAC.l[0] ? 0 : DNSOpt_Header_Space + mDNSSameEthAddress(m-PrimaryMAC, intf-MAC) ? DNSOpt_OwnerData_ID_Space : DNSOpt_OwnerData_ID_Wake_Space;
+ const int os = !intf-MAC.l[0] ? 0 : DNSOpt_Header_Space + (mDNSSameEthAddress(m-PrimaryMAC, intf-MAC) ? DNSOpt_OwnerData_ID_Space : DNSOpt_OwnerData_ID_Wake_Space);
int OwnerRecordSpace = 0;
AuthRecord *rr;
mDNSu8 *queryptr = m-omsg.data;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSCore
Module Name:src Committed By: joerg Date: Tue Jun 7 20:04:32 UTC 2011 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c Log Message: Add () that match operator order. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src
Committed By: joerg
Date: Tue May 24 15:30:31 UTC 2011
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c
Log Message:
Fix format string
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.1.1.1 Tue Sep 29 22:14:16 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Tue May 24 15:30:31 2011
@@ -432,7 +432,7 @@
{
// Should never happen. If it does, it indicates some OS bug,
// or that the mDNSResponder daemon crashed (which should never happen).
- syslog(LOG_WARNING, dnssd_clientstub write_all(%d) failed %ld/%d %d %s, sd, num_written, len,
+ syslog(LOG_WARNING, dnssd_clientstub write_all(%d) failed %zd/%d %d %s, sd, num_written, len,
(num_written 0) ? dnssd_errno : 0,
(num_written 0) ? dnssd_strerror(dnssd_errno) : );
return -1;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src
Committed By: joerg
Date: Tue May 24 15:44:28 UTC 2011
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c
Log Message:
Fix another format string
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.2 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.3
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.2 Tue May 24 15:30:31 2011
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Tue May 24 15:44:28 2011
@@ -458,7 +458,7 @@
{
// Should never happen. If it does, it indicates some OS bug,
// or that the mDNSResponder daemon crashed (which should never happen).
- syslog(LOG_WARNING, dnssd_clientstub read_all(%d) failed %ld/%d %d %s, sd, num_read, len,
+ syslog(LOG_WARNING, dnssd_clientstub read_all(%d) failed %zd/%d %d %s, sd, num_read, len,
(num_read 0) ? dnssd_errno : 0,
(num_read 0) ? dnssd_strerror(dnssd_errno) : );
return (num_read 0 dnssd_errno == dnssd_EWOULDBLOCK) ? read_all_wouldblock : read_all_fail;
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: joerg Date: Tue May 24 15:30:31 UTC 2011 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c Log Message: Fix format string To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
