Syntactic mod to minimizing changes with before PR

So changes are highlighted in side-by-side views.
This commit is contained in:
Willem Toorop 2018-02-08 12:02:48 +01:00
parent 7af885396f
commit bf1f01c87e
1 changed files with 38 additions and 41 deletions

View File

@ -2082,17 +2082,15 @@ upstream_select_stateful(getdns_network_req *netreq, getdns_transport_list_t tra
if (i >= upstreams->count)
i = 0;
} while (i != upstreams->current_stateful);
if (!upstream) {
/* Oh, oh. We have no valid upstreams for this transport. */
/* If there are other fallback transports that are working, we should
use them before forcilby promoting failed upstreams for re-try, since
use them before forcibly promoting failed upstreams for re-try, since
waiting for the the re-try timer to re-instate them is the right thing
in this case. */
if (other_transports_working(netreq, upstreams, transport)) {
if (other_transports_working(netreq, upstreams, transport))
return NULL;
}
else {
/* Try to find one that might work so
allow backed off upstreams to be considered valid.
Don't worry about the policy, just use the one with the least bad
@ -2128,7 +2126,6 @@ upstream_select_stateful(getdns_network_req *netreq, getdns_transport_list_t tra
upstream->transport == GETDNS_TRANSPORT_TLS ? "TLS" : "TCP");
return upstream;
}
}
/* Now select the specific upstream */
if (netreq->owner->context->round_robin_upstreams == 0) {