[src/trunk]: src/external/apache2/mDNSResponder/dist/mDNSCore Revert prior. I...

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

details:   https://anonhg.NetBSD.org/src/rev/b70ace0b8724
branches:  trunk
changeset: 341049:b70ace0b8724
user:      roy <roy%NetBSD.org@localhost>
date:      Thu Oct 15 15:58:34 2015 +0000

description:
Revert prior. Instead just send the diagnostic to debugf instead of syslog as it's not really that interesting.

diffstat:

 external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r 8e5660ee20f7 -r b70ace0b8724 external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
--- a/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c       Thu Oct 15 13:48:57 2015 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c       Thu Oct 15 15:58:34 2015 +0000
@@ -687,18 +687,16 @@
                // If (rr->LastAPTime + rr->ThisAPInterval) happens to be far in the past, we don't want to allow
                // NextScheduledProbe to be set excessively in the past, because that can cause bad things to happen.
                // See: <rdar://problem/7795434> mDNS: Sometimes advertising stops working and record interval is set to zero
-               // 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 @@
                                }
                        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 @@
                        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;
                                }
                        }