diff options
| author | Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com> | 2024-02-06 12:59:59 +0000 |
|---|---|---|
| committer | Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com> | 2024-03-14 06:52:19 +0000 |
| commit | 937159a5927032c040af3ddaeca8818f17e82edd (patch) | |
| tree | 6eb68aca4aab81ff25eb261d0aa4cddf54dd8349 | |
| parent | 2888e32ea9eef62457d8fc330ebd208cb20f33a9 (diff) | |
| download | DnsResolver-937159a5927032c040af3ddaeca8818f17e82edd.tar.gz | |
DnsResolver changes for supporting satellite transport
Bug: 320514105
Test: m and atest resolv_unit_test
Change-Id: I96d13b0accb905e538c979ad22bf43c8b2961439
| -rw-r--r-- | res_cache.cpp | 4 | ||||
| -rw-r--r-- | stats.proto | 2 | ||||
| -rw-r--r-- | tests/resolv_unit_test.cpp | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/res_cache.cpp b/res_cache.cpp index fbe426c8..bd6adde4 100644 --- a/res_cache.cpp +++ b/res_cache.cpp @@ -2013,6 +2013,8 @@ static android::net::NetworkType to_stats_network_type(int32_t mainType, bool wi return withVpn ? android::net::NT_BLUETOOTH_VPN : android::net::NT_BLUETOOTH; case IDnsResolver::TRANSPORT_ETHERNET: return withVpn ? android::net::NT_ETHERNET_VPN : android::net::NT_ETHERNET; + case IDnsResolver::TRANSPORT_SATELLITE: + return withVpn ? android::net::NT_UNKNOWN : android::net::NT_SATELLITE; case IDnsResolver::TRANSPORT_VPN: return withVpn ? android::net::NT_UNKNOWN : android::net::NT_VPN; case IDnsResolver::TRANSPORT_WIFI_AWARE: @@ -2080,6 +2082,8 @@ static const char* transport_type_to_str(const std::vector<int32_t>& transportTy return "ETHERNET_VPN"; case android::net::NT_WIFI_CELLULAR_VPN: return "WIFI_CELLULAR_VPN"; + case android::net::NT_SATELLITE: + return "SATELLITE"; default: return "UNKNOWN"; } diff --git a/stats.proto b/stats.proto index 1356b7fc..c4e474d7 100644 --- a/stats.proto +++ b/stats.proto @@ -196,6 +196,8 @@ enum NetworkType { NT_ETHERNET_VPN = 11; // Indicates this network uses a Wi-Fi+Cellular+VPN transport. NT_WIFI_CELLULAR_VPN = 12; + // Indicates this network uses an Satellite transport. + NT_SATELLITE = 13; } enum CacheStatus{ diff --git a/tests/resolv_unit_test.cpp b/tests/resolv_unit_test.cpp index af4cbf4e..e9868ccd 100644 --- a/tests/resolv_unit_test.cpp +++ b/tests/resolv_unit_test.cpp @@ -1895,6 +1895,7 @@ TEST_F(ResolvCommonFunctionTest, ConvertTransportsToNetworkType) { {android::net::NT_VPN, {IDnsResolver::TRANSPORT_VPN}}, {android::net::NT_WIFI_AWARE, {IDnsResolver::TRANSPORT_WIFI_AWARE}}, {android::net::NT_LOWPAN, {IDnsResolver::TRANSPORT_LOWPAN}}, + {android::net::NT_SATELLITE, {IDnsResolver::TRANSPORT_SATELLITE}}, {android::net::NT_CELLULAR_VPN, {IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_VPN}}, {android::net::NT_CELLULAR_VPN, |