Fixing retry conditions

MichaCo · MichaCo · commit 314f0a74a6da · 2021-05-26T02:51:56.000+02:00
diff --git a/src/DnsClient/LookupClient.cs b/src/DnsClient/LookupClient.cs
@@ -1564,9 +1564,13 @@ private IDnsQueryResponse ProcessResponseMessage(
                 {
                     handleError = HandleError.RetryNextServer;
                 }
+
                 // Try next server if the question isn't answered (ignoring ANY and AXFR queries)
                 else if (request.Question.QuestionType != QueryType.ANY
                    && request.Question.QuestionType != QueryType.AXFR
+                   && !((request.Question.QuestionType == QueryType.A || request.Question.QuestionType == QueryType.AAAA)
+                        && result.Answers.OfRecordType(ResourceRecordType.CNAME).Any())
+                   && !(request.Question.QuestionType == QueryType.NS && result.Authorities.Any())
                    && !result.Answers.OfRecordType((ResourceRecordType)request.Question.QuestionType).Any())
                 {
                     handleError = HandleError.RetryNextServer;

Original file line number	Diff line number	Diff line change
`@@ -1564,9 +1564,13 @@ private IDnsQueryResponse ProcessResponseMessage(`
`1564`	`1564`	`{`
`1565`	`1565`	`handleError = HandleError.RetryNextServer;`
`1566`	`1566`	`}`
	`1567`	`+`
`1567`	`1568`	`// Try next server if the question isn't answered (ignoring ANY and AXFR queries)`
`1568`	`1569`	`else if (request.Question.QuestionType != QueryType.ANY`
`1569`	`1570`	`&& request.Question.QuestionType != QueryType.AXFR`
	`1571`	`+ && !((request.Question.QuestionType == QueryType.A \|\| request.Question.QuestionType == QueryType.AAAA)`
	`1572`	`+ && result.Answers.OfRecordType(ResourceRecordType.CNAME).Any())`
	`1573`	`+ && !(request.Question.QuestionType == QueryType.NS && result.Authorities.Any())`
`1570`	`1574`	`&& !result.Answers.OfRecordType((ResourceRecordType)request.Question.QuestionType).Any())`
`1571`	`1575`	`{`
`1572`	`1576`	`handleError = HandleError.RetryNextServer;`