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

Commit 665f020b authored by Bernie Innocenti's avatar Bernie Innocenti Committed by Gerrit Code Review
Browse files

Merge "Move definitions of HostMapping next to its one and only reference"

parents e3fdcc86 ccbfb455
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -1016,9 +1016,13 @@ struct NetConfig {
    // Map format: ReturnCode:rate_denom
    std::unordered_map<int, uint32_t> dns_event_subsampling_map;
    DnsStats dnsStats;

    // Customized hostname/address table will be stored in customizedTable.
    // If resolverParams.hosts is empty, the existing customized table will be erased.
    typedef std::multimap<std::string /* hostname */, std::string /* IPv4/IPv6 address */>
            HostMapping;
    HostMapping customizedTable = {};

    int tc_mode = aidl::android::net::IDnsResolver::TC_MODE_DEFAULT;
    bool enforceDnsUid = false;
    std::vector<int32_t> transportTypes;
+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@
// The name servers are retrieved from the cache which is associated
// with the network to which ResState is associated.
struct ResState;

typedef std::multimap<std::string /* hostname */, std::string /* IPv4/IPv6 address */> HostMapping;

void resolv_populate_res_for_net(ResState* statp);

std::vector<unsigned> resolv_list_caches();