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

Commit fd5ddfec authored by Mike Yu's avatar Mike Yu Committed by Gerrit Code Review
Browse files

Merge "Test: Delete unused SetResolversForNetwork()" into main

parents b8b69001 6e247237

tests/dns_responder/dns_responder_client_ndk.cpp

+0 −16
Original line number Diff line number Diff line
@@ -117,22 +117,6 @@ Result<ResolverInfo> DnsResponderClient::getResolverInfo() { 
    return std::move(out);

}



bool DnsResponderClient::SetResolversForNetwork(const std::vector<std::string>& servers,

                                                const std::vector<std::string>& domains,

                                                std::vector<int> params) {

    params.resize(IDnsResolver::RESOLVER_PARAMS_COUNT);

    std::array<int, IDnsResolver::RESOLVER_PARAMS_COUNT> arr;

    std::copy_n(params.begin(), arr.size(), arr.begin());

    const auto resolverParams = ResolverParams::Builder()

                                        .setDomains(domains)

                                        .setDnsServers(servers)

                                        .setDotServers({})

                                        .setParams(arr)

                                        .build();

    const auto rv = mDnsResolvSrv->setResolverConfiguration(resolverParams);

    return rv.isOk();

}



bool DnsResponderClient::SetResolversForNetwork(const std::vector<std::string>& servers,

                                                const std::vector<std::string>& domains) {

    const auto resolverParams = ResolverParams::Builder()

tests/dns_responder/dns_responder_client_ndk.h

+0 −5
Original line number Diff line number Diff line
@@ -123,11 +123,6 @@ class DnsResponderClient { 
    static void SetupMappings(unsigned num_hosts, const std::vector<std::string>& domains,

                              std::vector<Mapping>* mappings);



    // For dns_benchmark built from tm-mainline-prod.

    // TODO: Remove it when possible.

    bool SetResolversForNetwork(const std::vector<std::string>& servers,

                                const std::vector<std::string>& domains, std::vector<int> params);



    // Sets up DnsResolver with given DNS servers. This is used to set up for private DNS off mode.

    bool SetResolversForNetwork(const std::vector<std::string>& servers = {kDefaultServer},

                                const std::vector<std::string>& domains = {kDefaultSearchDomain});