From f3b5e9756a4ed6cb22c7a623359106c70a7df4ac Mon Sep 17 00:00:00 2001 From: roy Date: Thu, 15 Oct 2015 15:58:34 +0000 Subject: [PATCH] Revert prior. Instead just send the diagnostic to debugf instead of syslog as it's not really that interesting. --- .../apache2/mDNSResponder/dist/mDNSCore/mDNS.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c b/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c index 7bc8b5a0ed2d..13c0a8620dbd 100755 --- a/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c +++ b/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c @@ -687,18 +687,16 @@ mDNSlocal void SetNextAnnounceProbeTime(mDNS *const m, const AuthRecord *const r // 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 *const m) } 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 *const m) 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; } }