Merge "Move bug workaround for old resolvers past the Private DNS codepath" (f7fca930) · Commits · e / os / android_packages_modules_DnsResolver

res_send.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -509,11 +509,6 @@ int res_nsend(ResState* statp, const uint8_t* buf, int buflen, uint8_t* ans, int
		return -ESRCH;
		}

		// If parallel_lookup is enabled, it might be required to wait some time to avoid
		// gateways drop packets if queries are sent too close together
		if (sleepTimeMs != 0ms) {
		std::this_thread::sleep_for(sleepTimeMs);
		}
		// Private DNS
		if (!(statp->netcontext_flags & NET_CONTEXT_FLAG_USE_LOCAL_NAMESERVERS)) {
		bool fallback = false;
		@@ -533,6 +528,12 @@ int res_nsend(ResState* statp, const uint8_t* buf, int buflen, uint8_t* ans, int
		}
		}

		// If parallel_lookup is enabled, it might be required to wait some time to avoid
		// gateways from dropping packets if queries are sent too close together.
		if (sleepTimeMs != 0ms) {
		std::this_thread::sleep_for(sleepTimeMs);
		}

		res_stats stats[MAXNS]{};
		res_params params;
		int revision_id = resolv_cache_get_resolver_stats(statp->netid, &params, stats, statp->nsaddrs);