Snap for 8814336 from 6b0d1269899e3c241122428f3f509a6941da7c3f to mainline-media-release (1c3e64b6) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -359,7 +359,6 @@ rust_test {
	edition: "2018",		edition: "2018",
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	auto_gen_config: true,		auto_gen_config: true,
	require_root: true,
	rustlibs: doh_rust_deps + ["libquiche_static"],		rustlibs: doh_rust_deps + ["libquiche_static"],
	min_sdk_version: "29",		min_sdk_version: "29",
	}		}

DnsQueryLogTest.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,9 +20,9 @@
	#include <android-base/strings.h>		#include <android-base/strings.h>
	#include <android-base/test_utils.h>		#include <android-base/test_utils.h>
	#include <gtest/gtest.h>		#include <gtest/gtest.h>
			#include <netdutils/NetNativeTestBase.h>

	#include "DnsQueryLog.h"		#include "DnsQueryLog.h"
	#include "tests/resolv_test_base.h"

	using namespace std::chrono_literals;		using namespace std::chrono_literals;

	@@ -59,7 +59,7 @@ void verifyDumpOutput(const std::string& dumpLog, const std::vector<int>& expect

	} // namespace		} // namespace

	class DnsQueryLogTest : public ResolvTestBase {		class DnsQueryLogTest : public NetNativeTestBase {
	protected:		protected:
	const std::vector<std::string> serversV4 = {"127.0.0.1", "1.2.3.4"};		const std::vector<std::string> serversV4 = {"127.0.0.1", "1.2.3.4"};
	const std::vector<std::string> serversV4V6 = {"127.0.0.1", "1.2.3.4", "2001:db8::1",		const std::vector<std::string> serversV4V6 = {"127.0.0.1", "1.2.3.4", "2001:db8::1",

DnsStatsTest.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -19,9 +19,9 @@
	#include <android-base/test_utils.h>		#include <android-base/test_utils.h>
	#include <gmock/gmock.h>		#include <gmock/gmock.h>
	#include <gtest/gtest.h>		#include <gtest/gtest.h>
			#include <netdutils/NetNativeTestBase.h>

	#include "DnsStats.h"		#include "DnsStats.h"
	#include "tests/resolv_test_base.h"

	namespace android::net {		namespace android::net {

	@@ -67,7 +67,7 @@ StatsData makeStatsData(const IPSockAddr& server, const int total, const microse

	// TODO: add StatsDataTest to ensure its methods return correct outputs.		// TODO: add StatsDataTest to ensure its methods return correct outputs.

	class StatsRecordsTest : public ResolvTestBase {};		class StatsRecordsTest : public NetNativeTestBase {};

	TEST_F(StatsRecordsTest, PushRecord) {		TEST_F(StatsRecordsTest, PushRecord) {
	const IPSockAddr server = IPSockAddr::toIPSockAddr("127.0.0.2", 53);		const IPSockAddr server = IPSockAddr::toIPSockAddr("127.0.0.2", 53);
	@@ -105,7 +105,7 @@ TEST_F(StatsRecordsTest, PushRecord) {
	makeStatsData(server, 3, 750ms, {{NS_R_NO_ERROR, 0}, {NS_R_TIMEOUT, 3}}));		makeStatsData(server, 3, 750ms, {{NS_R_NO_ERROR, 0}, {NS_R_TIMEOUT, 3}}));
	}		}

	class DnsStatsTest : public ResolvTestBase {		class DnsStatsTest : public NetNativeTestBase {
	protected:		protected:
	std::string captureDumpOutput() {		std::string captureDumpOutput() {
	netdutils::DumpWriter dw(STDOUT_FILENO);		netdutils::DumpWriter dw(STDOUT_FILENO);

Experiments.h

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -46,13 +46,8 @@ class Experiments {
	void updateInternal() EXCLUDES(mMutex);		void updateInternal() EXCLUDES(mMutex);
	mutable std::mutex mMutex;		mutable std::mutex mMutex;
	std::map<std::string_view, int> mFlagsMapInt GUARDED_BY(mMutex);		std::map<std::string_view, int> mFlagsMapInt GUARDED_BY(mMutex);
	// TODO: Migrate other experiment flags to here.		// Sort the list by alphabet ordering.
	// (retry_count, retransmission_time_interval)
	static constexpr const char* const kExperimentFlagKeyList[] = {		static constexpr const char* const kExperimentFlagKeyList[] = {
	"keep_listening_udp",
	"parallel_lookup_release",
	"parallel_lookup_sleep_time",
	"sort_nameservers",
	"dot_async_handshake",		"dot_async_handshake",
	"dot_connect_timeout_ms",		"dot_connect_timeout_ms",
	"dot_maxtries",		"dot_maxtries",
	@@ -68,8 +63,14 @@ class Experiments {
	"doh_probe_timeout_ms",		"doh_probe_timeout_ms",
	"doh_idle_timeout_ms",		"doh_idle_timeout_ms",
	"doh_session_resumption",		"doh_session_resumption",
	"mdns_resolution",		"keep_listening_udp",
	"max_queries_global",		"max_queries_global",
			"mdns_resolution",
			"parallel_lookup_release",
			"parallel_lookup_sleep_time",
			"retransmission_time_interval",
			"retry_count",
			"sort_nameservers",
	};		};
	// This value is used in updateInternal as the default value if any flags can't be found.		// This value is used in updateInternal as the default value if any flags can't be found.
	static constexpr int kFlagIntDefault = INT_MIN;		static constexpr int kFlagIntDefault = INT_MIN;

ExperimentsTest.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,13 +23,13 @@
	#include <android-base/test_utils.h>		#include <android-base/test_utils.h>
	#include <gmock/gmock.h>		#include <gmock/gmock.h>
	#include <gtest/gtest.h>		#include <gtest/gtest.h>
			#include <netdutils/NetNativeTestBase.h>

	#include "Experiments.h"		#include "Experiments.h"
	#include "tests/resolv_test_base.h"

	namespace android::net {		namespace android::net {

	class ExperimentsTest : public ResolvTestBase {		class ExperimentsTest : public NetNativeTestBase {
	public:		public:
	ExperimentsTest() : mExperiments(fakeGetExperimentFlagInt) {}		ExperimentsTest() : mExperiments(fakeGetExperimentFlagInt) {}