Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refine the proto dns_resolver.proto"

Browse Source
This commit is contained in:
Frank Li
2019-06-18 11:54:12 +00:00
committed by Gerrit Code Review
parent 6aff608375 ad9beccd2a
commit 257719b2d5
2 changed files with 217 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/statsd/src/atoms.proto
View File

@@ -2818,7 +2818,7 @@ message NetworkDnsEventReported {
// Only valid for event_type = EVENT_RESNSEND. // Only valid for event_type = EVENT_RESNSEND.
optional int32 res_nsend_flags = 5; optional int32 res_nsend_flags = 5;
optional android.stats.dnsresolver.Transport network_type = 6; optional android.stats.dnsresolver.NetworkType network_type = 6;
// The DNS over TLS mode on a specific netId. // The DNS over TLS mode on a specific netId.
optional android.stats.dnsresolver.PrivateDnsModes private_dns_modes = 7; optional android.stats.dnsresolver.PrivateDnsModes private_dns_modes = 7;

32
core/proto/android/stats/dnsresolver/dns_resolver.proto
View File

@@ -67,6 +67,7 @@ enum NsRcode {
// NS_R_BADSIG = 16, // NS_R_BADSIG = 16,
NS_R_BADKEY = 17; NS_R_BADKEY = 17;
NS_R_BADTIME = 18; NS_R_BADTIME = 18;
NS_R_TIMEOUT = 255;
} }
// Currently defined type values for resources and queries. // Currently defined type values for resources and queries.
@@ -143,11 +144,11 @@ enum IpVersion {
IV_IPV6 = 2; IV_IPV6 = 2;
} }
enum TransportType { enum Protocol {
TT_UNKNOWN = 0; PROTO_UNKNOWN = 0;
TT_UDP = 1; PROTO_UDP = 1;
TT_TCP = 2; PROTO_TCP = 2;
TT_DOT = 3; PROTO_DOT = 3;
} }
enum PrivateDnsModes { enum PrivateDnsModes {
@@ -157,21 +158,22 @@ enum PrivateDnsModes {
PDM_STRICT = 3; PDM_STRICT = 3;
} }
enum Transport { enum NetworkType {
NT_UNKNOWN = 0;
// Indicates this network uses a Cellular transport. // Indicates this network uses a Cellular transport.
TRANSPORT_DEFAULT = 0; // TRANSPORT_CELLULAR NT_CELLULAR = 1;
// Indicates this network uses a Wi-Fi transport. // Indicates this network uses a Wi-Fi transport.
TRANSPORT_WIFI = 1; NT_WIFI = 2;
// Indicates this network uses a Bluetooth transport. // Indicates this network uses a Bluetooth transport.
TRANSPORT_BLUETOOTH = 2; NT_BLUETOOTH = 3;
// Indicates this network uses an Ethernet transport. // Indicates this network uses an Ethernet transport.
TRANSPORT_ETHERNET = 3; NT_ETHERNET = 4;
// Indicates this network uses a VPN transport. // Indicates this network uses a VPN transport.
TRANSPORT_VPN = 4; NT_VPN = 5;
// Indicates this network uses a Wi-Fi Aware transport. // Indicates this network uses a Wi-Fi Aware transport.
TRANSPORT_WIFI_AWARE = 5; NT_WIFI_AWARE = 6;
// Indicates this network uses a LoWPAN transport. // Indicates this network uses a LoWPAN transport.
TRANSPORT_LOWPAN = 6; NT_LOWPAN = 7;
} }
enum CacheStatus{ enum CacheStatus{
@@ -195,13 +197,13 @@ message DnsQueryEvent {
optional android.stats.dnsresolver.IpVersion ip_version = 4; optional android.stats.dnsresolver.IpVersion ip_version = 4;
optional android.stats.dnsresolver.TransportType transport = 5; optional android.stats.dnsresolver.Protocol protocol = 5;
// Number of DNS query retry times // Number of DNS query retry times
optional int32 retry_times = 6; optional int32 retry_times = 6;
// Ordinal number of name server. // Ordinal number of name server.
optional int32 dns_server_count = 7; optional int32 dns_server_index = 7;
// Used only by TCP and DOT. True for new connections. // Used only by TCP and DOT. True for new connections.
optional bool connected = 8; optional bool connected = 8;