diff options
| author | roy <roy@NetBSD.org> | 2015-10-15 10:29:57 +0000 |
|---|---|---|
| committer | roy <roy@NetBSD.org> | 2015-10-15 10:29:57 +0000 |
| commit | bb25411bc9b5d23aff2260444478ae06385642d4 (patch) | |
| tree | aed12b7ab9dbafc697439953b0d22046eeee7148 /external/apache2 | |
| parent | 5e29203a15df5233fa12d63984f2f1d6e7f2cd37 (diff) | |
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.
Diffstat (limited to 'external/apache2')
| -rwxr-xr-x | external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c b/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c index 305a1dae458..7bc8b5a0ed2 100755 --- a/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c +++ b/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c @@ -687,14 +687,18 @@ 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: <rdar://problem/7795434> 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) |
