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

Commit 480f1584 authored by Erik Kline's avatar Erik Kline Committed by Mike Yu
Browse files

Use socket address toString for proper IPv6 syntax 

Test: cd packages/modules/DnsResolver && atest
Change-Id: Id83e222a30dba1a58de1b1ec760e632ab01a4376
parent 770cf75b

DnsStats.cpp

+3 −4
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ int StatsData::averageLatencyMs() const { 
}



std::string StatsData::toString() const {

    if (total == 0)

        return fmt::format("{}:{} <no data>", sockAddr.ip().toString(), sockAddr.port());

    if (total == 0) return fmt::format("{} <no data>", sockAddr.toString());



    const auto now = std::chrono::steady_clock::now();

    const int lastUpdateSec = duration_cast<seconds>(now - lastUpdate).count();
@@ -92,8 +91,8 @@ std::string StatsData::toString() const { 
            buf += fmt::format("{}:{} ", rcodeToName(rcode), counts);

        }

    }

    return fmt::format("{}:{} ({}, {}ms, [{}], {}s)", sockAddr.ip().toString(), sockAddr.port(),

                       total, averageLatencyMs(), buf, lastUpdateSec);

    return fmt::format("{} ({}, {}ms, [{}], {}s)", sockAddr.toString(), total, averageLatencyMs(),

                       buf, lastUpdateSec);

}



StatsRecords::StatsRecords(const IPSockAddr& ipSockAddr, size_t size)

DnsStatsTest.cpp

+2 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ class DnsStatsTest : public ::testing::Test { 
                          const std::vector<StatsData>& dohData) {

        // A pattern to capture three matches:

        //     server address (empty allowed), the statistics, and the score.

        const std::regex pattern(R"(\s{4,}([0-9a-fA-F:\.]*)[ ]?([<(].*[>)])[ ]?(\S*))");

        const std::regex pattern(R"(\s{4,}([0-9a-fA-F:\.\]\[]*)[ ]?([<(].*[>)])[ ]?(\S*))");

        std::string dumpString = captureDumpOutput();



        const auto check = [&](const std::vector<StatsData>& statsData, const std::string& protocol,
@@ -142,8 +142,7 @@ class DnsStatsTest : public ::testing::Test { 


            for (const auto& stats : statsData) {

                ASSERT_TRUE(std::regex_search(*dumpString, sm, pattern));

                EXPECT_EQ(sm[1], stats.sockAddr.ip().toString() + ":" +

                                         std::to_string(stats.sockAddr.port()));

                EXPECT_EQ(sm[1], stats.sockAddr.toString());

                EXPECT_FALSE(sm[2].str().empty());

                EXPECT_FALSE(sm[3].str().empty());

                *dumpString = sm.suffix();

tests/resolv_private_dns_test.cpp

+7 −5
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ using aidl::android::net::resolv::aidl::IDnsResolverUnsolicitedEventListener; 
using android::base::ReadFdToString;

using android::base::unique_fd;

using android::net::resolv::aidl::UnsolicitedEventListener;

using android::netdutils::IPSockAddr;

using android::netdutils::ScopedAddrinfo;

using android::netdutils::Stopwatch;

using std::chrono::milliseconds;
@@ -171,21 +172,22 @@ class BaseTest : public ::testing::Test { 
                       serverAddr, IDnsResolverUnsolicitedEventListener::PROTOCOL_DOH);

    }



    bool expectLog(const std::string& serverAddr, const std::string& listen_address) {

    bool expectLog(const std::string& ipAddrOrNoData, const std::string& port) {

        ndk::SpAIBinder resolvBinder = ndk::SpAIBinder(AServiceManager_getService("dnsresolver"));

        assert(nullptr != resolvBinder.get());

        std::vector<std::string> lines = dumpService(resolvBinder);



        const std::string ipAddr =

                listen_address.empty() ? serverAddr : serverAddr + ":" + listen_address;

        const std::regex pattern(R"(^\s{4,}([0-9a-fA-F:\.]*)[ ]?([<(].*[>)])[ ]?(\S*)$)");

        const std::string expectedLog =

                port.empty() ? ipAddrOrNoData

                             : IPSockAddr::toIPSockAddr(ipAddrOrNoData, std::stoi(port)).toString();

        const std::regex pattern(R"(^\s{4,}([0-9a-fA-F:\.\]\[]*)[ ]?([<(].*[>)])[ ]?(\S*)$)");



        for (const auto& line : lines) {

            if (line.empty()) continue;



            std::smatch match;

            if (std::regex_match(line, match, pattern)) {

                if (match[1] == ipAddr || match[2] == ipAddr) return true;

                if (match[1] == expectedLog || match[2] == expectedLog) return true;

            }

        }

        return false;