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

Commit 408ffad2 authored by Mike Yu's avatar Mike Yu Committed by Bernie Innocenti
Browse files

resolv: remove resolv_delete_private_dns_for_net 

It is no longer necessary since ResolverController can directly
access the instance of PrivateDnsConfiguration and call its
method.

Bug: 130686826
Bug: 133117690
Change-Id: I16b06d9f8d438950116696296a6d6a066eb4c08b
Merged-In: I340f60ef11415c9b83aa66884fffdfae3153d1d0
(cherry picked from commit 83c038a329d850950a6c60a0ae17e424daa8a29a)
parent efa5f901

PrivateDnsConfiguration.cpp

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ 
#include "netd_resolv/resolv.h"

#include "netdutils/BackoffSequence.h"



void resolv_delete_private_dns_for_net(unsigned netid) {

    android::net::gPrivateDnsConfiguration.clear(netid);

}



namespace android {

namespace net {

ResolverController.cpp

+1 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ void ResolverController::destroyNetworkCache(unsigned netId) { 


    resolv_delete_cache_for_net(netId);

    mDns64Configuration.stopPrefixDiscovery(netId);

    resolv_delete_private_dns_for_net(netId);

    gPrivateDnsConfiguration.clear(netId);

}



int ResolverController::createNetworkCache(unsigned netId) {
@@ -195,8 +195,6 @@ int ResolverController::createNetworkCache(unsigned netId) { 
    return resolv_create_cache_for_net(netId);

}



// TODO: remove below functions and call into PrivateDnsConfiguration directly.

//       resolv_delete_private_dns_for_net()

int ResolverController::setResolverConfiguration(

        const ResolverParamsParcel& resolverParams,

        const std::set<std::vector<uint8_t>>& tlsFingerprints) {

include/netd_resolv/resolv.h

+0 −2
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ int resolv_res_nsend(const android_net_context* netContext, const uint8_t* msg, 
int resolv_set_nameservers_for_net(unsigned netid, const char** servers, int numservers,

                                   const char* domains, const res_params* params);



void resolv_delete_private_dns_for_net(unsigned netid);



// Delete the cache associated with a certain network

void resolv_delete_cache_for_net(unsigned netid);

// Create the cache associated with a certain network