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

Commit 2755c1a5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8733159 from 5f5becc5 to mainline-wifi-release 

Change-Id: Ic91227f6d987e2697ebc974a436d739365f753d4
parents dbd411e5 5f5becc5

PrivateDnsConfiguration.cpp

+2 −5
Original line number Diff line number Diff line
@@ -301,11 +301,8 @@ bool PrivateDnsConfiguration::recordPrivateDnsValidation(const ServerIdentity& i 
    }



    bool reevaluationStatus = NEEDS_REEVALUATION;

    if (success) {

        reevaluationStatus = DONT_REEVALUATE;

    } else if (mode->second == PrivateDnsMode::OFF) {

        reevaluationStatus = DONT_REEVALUATE;

    } else if (mode->second == PrivateDnsMode::OPPORTUNISTIC && !isRevalidation) {

    if (success || (mode->second == PrivateDnsMode::OFF) ||

        (mode->second == PrivateDnsMode::OPPORTUNISTIC && !isRevalidation)) {

        reevaluationStatus = DONT_REEVALUATE;

    }

res_send.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1454,9 +1454,7 @@ int res_tls_send(const std::list<DnsTlsServer>& tlsServers, ResState* statp, con 
            // It's OPPORTUNISTIC mode,

            // hence it's not required to do anything because it'll fallback to UDP.

            case DnsTlsTransport::Response::network_error:

                [[fallthrough]];

            case DnsTlsTransport::Response::internal_error:

                [[fallthrough]];

            default:

                return -1;

        }

tests/doh/src/dns_https_frontend.rs

+4 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ use tokio::task::JoinHandle; 
lazy_static! {

    static ref RUNTIME_STATIC: Arc<Runtime> = Arc::new(

        Builder::new_multi_thread()

            .worker_threads(2)

            .max_blocking_threads(1)

            .worker_threads(1)

            .enable_all()

            .thread_name("DohFrontend")

            .build()
@@ -144,6 +143,9 @@ impl DohFrontend { 
            }



            worker_thread.abort();

            RUNTIME_STATIC.block_on(async {

                debug!("worker_thread result: {:?}", worker_thread.await);

            })

        }



        debug!("DohFrontend: stopped: {:?}", self);

tests/resolv_private_dns_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ class BasePrivateDnsTest : public BaseTest { 
        const addrinfo hints = {.ai_socktype = SOCK_DGRAM};

        ScopedAddrinfo result = safe_getaddrinfo(host_name, nullptr, &hints);

        EXPECT_THAT(ToStrings(result),

                    testing::ElementsAreArray({kQueryAnswerAAAA, kQueryAnswerA}));

                    testing::UnorderedElementsAreArray({kQueryAnswerAAAA, kQueryAnswerA}));

    };



    void expectQueries(int dnsQueries, int dotQueries, int dohQueries) {