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

Commit eda94efc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6029552 from 318483d3 to rvc-release 

Change-Id: I0ea5555acdaf4c206e2acb987dab4662752a7e4f
parents 86644398 318483d3

DnsProxyListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ 
#include "ResolverEventReporter.h"

#include "getaddrinfo.h"

#include "gethnamaddr.h"

#include "netd_resolv/stats.h"  // RCODE_TIMEOUT

#include "res_send.h"

#include "resolv_cache.h"

#include "resolv_private.h"

#include "stats.h"  // RCODE_TIMEOUT

#include "stats.pb.h"



using aidl::android::net::metrics::INetdEventListener;

DnsResolverService.cpp

+9 −0
Original line number Diff line number Diff line
@@ -249,5 +249,14 @@ binder_status_t DnsResolverService::dump(int fd, const char**, uint32_t) { 
    return statusFromErrcode(res);

}



::ndk::ScopedAStatus DnsResolverService::flushNetworkCache(int netId) {

    // Locking happens in res_cache.cpp functions.

    ENFORCE_NETWORK_STACK_PERMISSIONS();



    int res = gDnsResolv->resolverCtrl.flushNetworkCache(netId);



    return statusFromErrcode(res);

}



}  // namespace net

}  // namespace android

DnsResolverService.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ class DnsResolverService : public aidl::android::net::BnDnsResolver { 
            std::vector<int32_t>* wait_for_pending_req_timeout_count) override;

    ::ndk::ScopedAStatus destroyNetworkCache(int32_t netId) override;

    ::ndk::ScopedAStatus createNetworkCache(int32_t netId) override;

    ::ndk::ScopedAStatus flushNetworkCache(int32_t netId) override;



    // DNS64-related commands

    ::ndk::ScopedAStatus startPrefix64Discovery(int32_t netId) override;

DnsTlsServer.h

+2 −5
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
 * limitations under the License.

 */



#ifndef _DNS_DNSTLSSERVER_H

#define _DNS_DNSTLSSERVER_H

#pragma once



#include <chrono>

#include <set>
@@ -24,7 +23,7 @@ 


#include <netinet/in.h>



#include <netd_resolv/params.h>

#include <params.h>



namespace android {

namespace net {
@@ -80,5 +79,3 @@ struct AddressComparator { 


}  // namespace net

}  // namespace android
 


#endif  // _DNS_DNSTLSSERVER_H

ResolverController.cpp

+6 −1
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
#include "PrivateDnsConfiguration.h"

#include "ResolverEventReporter.h"

#include "ResolverStats.h"

#include "netd_resolv/stats.h"

#include "resolv_cache.h"

#include "stats.h"



using aidl::android::net::ResolverParamsParcel;
@@ -194,6 +194,11 @@ int ResolverController::createNetworkCache(unsigned netId) { 
    return resolv_create_cache_for_net(netId);

}



int ResolverController::flushNetworkCache(unsigned netId) {

    LOG(VERBOSE) << __func__ << ": netId = " << netId;

    return resolv_flush_cache_for_net(netId);

}



int ResolverController::setResolverConfiguration(const ResolverParamsParcel& resolverParams) {

    using aidl::android::net::IDnsResolver;