Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff7703fd authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

Add one more test DoH provider in the list am: 770cf75b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1890099

Change-Id: I5de89b4947fa55ece6eafd9a77cbeaa8e2ad9ad9
parents d2f8d55b 770cf75b

PrivateDnsConfiguration.h

+7 −2
Original line number Original line Diff line number Diff line
@@ -223,7 +223,7 @@ class PrivateDnsConfiguration { 




    // TODO: Move below DoH relevant stuff into Rust implementation.

    // TODO: Move below DoH relevant stuff into Rust implementation.

    std::map<unsigned, DohIdentity> mDohTracker GUARDED_BY(mPrivateDnsLock);

    std::map<unsigned, DohIdentity> mDohTracker GUARDED_BY(mPrivateDnsLock);

    std::array<DohProviderEntry, 3> mAvailableDoHProviders = {{

    std::array<DohProviderEntry, 4> mAvailableDoHProviders = {{

            {"Google",

            {"Google",

             {"2001:4860:4860::8888", "2001:4860:4860::8844", "8.8.8.8", "8.8.4.4"},

             {"2001:4860:4860::8888", "2001:4860:4860::8844", "8.8.8.8", "8.8.4.4"},

             "dns.google",

             "dns.google",
@@ -235,12 +235,17 @@ class PrivateDnsConfiguration { 
             "https://cloudflare-dns.com/dns-query",

             "https://cloudflare-dns.com/dns-query",

             false},

             false},





            // The DoH provider for testing.

            // The DoH providers for testing only.

            {"ResolverTestProvider",

            {"ResolverTestProvider",

             {"127.0.0.3", "::1"},

             {"127.0.0.3", "::1"},

             "example.com",

             "example.com",

             "https://example.com/dns-query",

             "https://example.com/dns-query",

             true},

             true},

            {"AndroidTesting",

             {"192.0.2.100"},

             "dns.androidtesting.org",

             "https://dns.androidtesting.org/dns-query",

             false},

    }};

    }};





    struct RecordEntry {

    struct RecordEntry {