Snap for 8944493 from c7a164404165126b7a39afa7cb664abdd9279a5a to mainline-ipsec-release (4655675f) · Commits · e / os / android_packages_modules_DnsResolver

Experiments.h

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -46,23 +46,22 @@ 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);
	// Sort the list by alphabet ordering.
	static constexpr const char* const kExperimentFlagKeyList[] = {		static constexpr const char* const kExperimentFlagKeyList[] = {
			"doh",
			"doh_early_data",
			"doh_idle_timeout_ms",
			"doh_probe_timeout_ms",
			"doh_query_timeout_ms",
			"doh_session_resumption",
	"dot_async_handshake",		"dot_async_handshake",
	"dot_connect_timeout_ms",		"dot_connect_timeout_ms",
	"dot_maxtries",		"dot_maxtries",
	"dot_revalidation_threshold",
	"dot_xport_unusable_threshold",
	"dot_query_timeout_ms",		"dot_query_timeout_ms",
	"dot_quick_fallback",		"dot_quick_fallback",
			"dot_revalidation_threshold",
	"dot_validation_latency_factor",		"dot_validation_latency_factor",
	"dot_validation_latency_offset_ms",		"dot_validation_latency_offset_ms",
	"doh",		"dot_xport_unusable_threshold",
	"doh_early_data",
	"doh_query_timeout_ms",
	"doh_probe_timeout_ms",
	"doh_idle_timeout_ms",
	"doh_session_resumption",
	"keep_listening_udp",		"keep_listening_udp",
	"max_queries_global",		"max_queries_global",
	"mdns_resolution",		"mdns_resolution",

doh/boot_time.rs

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,7 @@ pub struct BootTime {
	// Return an error with the same structure as tokio::time::timeout to facilitate migration off it,		// Return an error with the same structure as tokio::time::timeout to facilitate migration off it,
	// and hopefully some day back to it.		// and hopefully some day back to it.
	/// Error returned by timeout		/// Error returned by timeout
	#[derive(Debug, PartialEq)]		#[derive(Debug, PartialEq, Eq)]
	pub struct Elapsed(());		pub struct Elapsed(());

	impl fmt::Display for Elapsed {		impl fmt::Display for Elapsed {

stats.proto

+61 −0

Original line number	Original line	Diff line number	Diff line
	@@ -413,3 +413,64 @@ message NetworkDnsEventReported {
	// The sample rate of DNS stats (to statsd) is 1/sampling_rate_denom.		// The sample rate of DNS stats (to statsd) is 1/sampling_rate_denom.
	optional int32 sampling_rate_denom = 9;		optional int32 sampling_rate_denom = 9;
	}		}

			enum HandshakeResult {
			HR_UNKNOWN = 0;
			HR_SUCCESS = 1;
			HR_TIMEOUT = 2;
			HR_TLS_FAIL = 3;
			HR_SERVER_UNREACHABLE = 4;
			}

			enum HandshakeCause {
			HC_UNKNOWN = 0;
			HC_SERVER_PROBE = 1;
			HC_RECONNECT_AFTER_IDLE = 2;
			HC_RETRY_AFTER_ERROR = 3;
			}

			/**
			* The NetworkDnsHandshakeReported message describes a DoT or DoH handshake operation along with
			* its result, cause, network latency, TLS version, etc.
			*
			*/
			message NetworkDnsHandshakeReported {
			optional Protocol protocol = 1;

			optional HandshakeResult result = 2;

			optional HandshakeCause cause = 3;

			optional NetworkType network_type = 4;

			optional PrivateDnsModes private_dns_mode = 5;

			// The latency in microseconds of the entire handshake operation.
			optional int32 latency_micros = 6;

			// Sent packets in bytes.
			optional int32 bytes_sent = 7;

			// Received packets in bytes.
			optional int32 bytes_received = 8;

			// Number of round-trips.
			optional int32 round_trips = 9;

			// True if TLS session cache hit.
			optional bool tls_session_cache_hit = 10;

			// 2 = TLS 1.2, 3 = TLS 1.3
			optional int32 tls_version = 11;

			// True if the handshake requires verifying the private DNS provider hostname.
			optional bool hostname_verification = 12;

			// Only present when protocol = PROTO_DOH.
			optional int32 quic_version = 13;

			optional int32 server_index = 14;

			// The sampling-rate of this event is 1/sampling_rate_denom.
			optional int32 sampling_rate_denom = 15;
			}