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

Commit 86b76c13 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8513843 from bfe94814 to mainline-uwb-release 

Change-Id: I462a2d914731cbc235d7fccadb949a9e963f4546
parents ef30df96 bfe94814

DnsProxyListener.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1159,7 +1159,9 @@ void DnsProxyListener::GetHostByNameHandler::run() { 
    event.set_latency_micros(latencyUs);

    event.set_event_type(EVENT_GETHOSTBYNAME);



    LOG(DEBUG) << "GetHostByNameHandler::run: result: " << gai_strerror(rv);

    if (rv) {

        LOG(DEBUG) << "GetHostByNameHandler::run: result failed: " << gai_strerror(rv);

    }



    bool success = true;

    if (hp) {
@@ -1314,7 +1316,9 @@ void DnsProxyListener::GetHostByAddrHandler::run() { 
    event.set_latency_micros(latencyUs);

    event.set_event_type(EVENT_GETHOSTBYADDR);



    LOG(DEBUG) << "GetHostByAddrHandler::run: result: " << gai_strerror(rv);

    if (rv) {

        LOG(DEBUG) << "GetHostByAddrHandler::run: result failed: " << gai_strerror(rv);

    }



    bool success = true;

    if (hp) {

DnsQueryLogTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <gtest/gtest.h>



#include "DnsQueryLog.h"

#include "tests/resolv_test_base.h"



using namespace std::chrono_literals;
@@ -58,7 +59,7 @@ void verifyDumpOutput(const std::string& dumpLog, const std::vector<int>& expect 


}  // namespace



class DnsQueryLogTest : public ::testing::Test {

class DnsQueryLogTest : public ResolvTestBase {

  protected:

    const std::vector<std::string> serversV4 = {"127.0.0.1", "1.2.3.4"};

    const std::vector<std::string> serversV4V6 = {"127.0.0.1", "1.2.3.4", "2001:db8::1",

DnsResolver.cpp

+2 −4
Original line number Diff line number Diff line
@@ -31,10 +31,8 @@ 
bool resolv_init(const ResolverNetdCallbacks* callbacks) {

    android::base::InitLogging(/*argv=*/nullptr);

    LOG(INFO) << __func__ << ": Initializing resolver";

    // TODO(b/170539625): restore log level to WARNING after clarifying flaky tests.

    const bool isDebug = isUserDebugBuild();

    resolv_set_log_severity(isDebug ? android::base::DEBUG : android::base::WARNING);

    doh_init_logger(isDebug ? DOH_LOG_LEVEL_DEBUG : DOH_LOG_LEVEL_WARN);

    resolv_set_log_severity(android::base::WARNING);

    doh_init_logger(DOH_LOG_LEVEL_WARN);

    using android::net::gApiLevel;

    gApiLevel = getApiLevel();

    using android::net::gResNetdCallbacks;

DnsStatsTest.cpp

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <gtest/gtest.h>



#include "DnsStats.h"

#include "tests/resolv_test_base.h"



namespace android::net {
@@ -66,7 +67,7 @@ StatsData makeStatsData(const IPSockAddr& server, const int total, const microse 


// TODO: add StatsDataTest to ensure its methods return correct outputs.



class StatsRecordsTest : public ::testing::Test {};

class StatsRecordsTest : public ResolvTestBase {};



TEST_F(StatsRecordsTest, PushRecord) {

    const IPSockAddr server = IPSockAddr::toIPSockAddr("127.0.0.2", 53);
@@ -104,7 +105,7 @@ TEST_F(StatsRecordsTest, PushRecord) { 
              makeStatsData(server, 3, 750ms, {{NS_R_NO_ERROR, 0}, {NS_R_TIMEOUT, 3}}));

}



class DnsStatsTest : public ::testing::Test {

class DnsStatsTest : public ResolvTestBase {

  protected:

    std::string captureDumpOutput() {

        netdutils::DumpWriter dw(STDOUT_FILENO);

DnsTlsDispatcher.cpp

+5 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ std::list<DnsTlsServer> DnsTlsDispatcher::getOrderedAndUsableServerList( 


DnsTlsTransport::Response DnsTlsDispatcher::query(const std::list<DnsTlsServer>& tlsServers,

                                                  ResState* statp, const Slice query,

                                                  const Slice ans, int* resplen) {

                                                  const Slice ans, int* resplen,

                                                  bool dotQuickFallback) {

    const std::list<DnsTlsServer> servers(

            getOrderedAndUsableServerList(tlsServers, statp->netid, statp->mark));
@@ -150,6 +151,9 @@ DnsTlsTransport::Response DnsTlsDispatcher::query(const std::list<DnsTlsServer>& 
                // Sync from res_tls_send in res_send.cpp

                dnsQueryEvent->set_rcode(NS_R_TIMEOUT);

                resolv_stats_add(statp->netid, IPSockAddr::toIPSockAddr(server.ss), dnsQueryEvent);

                if (dotQuickFallback) {

                    return code;

                }

                break;

            case DnsTlsTransport::Response::internal_error:

                dnsQueryEvent->set_rcode(NS_R_INTERNAL_ERROR);