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

Commit 57912899 authored by Bernie Innocenti's avatar Bernie Innocenti Committed by android-build-merger
Browse files

Merge "Move internal functions out of libnetd_resolv's public headers" am:... 

Merge "Move internal functions out of libnetd_resolv's public headers" am: e5e9aceaee am: df8e859eec am: f273c87929
am: 7e96ec8d99

Change-Id: If3ba28b5c2f1e1675aca2c39f16a9451ec6110ed
parents c861e257 a8151b0a

Dns64Configuration.cpp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include "DnsResolver.h"

#include "NetdConstants.h"  // ScopedAddrinfo

#include "getaddrinfo.h"

#include "netd_resolv/resolv.h"

#include "netdutils/BackoffSequence.h"

#include "netdutils/DumpWriter.h"

DnsProxyListener.cpp

+3 −0
Original line number Diff line number Diff line
@@ -53,7 +53,10 @@ 
#include "NetdPermissions.h"

#include "PrivateDnsConfiguration.h"

#include "ResolverEventReporter.h"

#include "getaddrinfo.h"

#include "gethnamaddr.h"

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

#include "res_send.h"

#include "resolv_private.h"

#include "stats.pb.h"

DnsProxyListener.h

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

 */



#ifndef _DNSPROXYLISTENER_H__

#define _DNSPROXYLISTENER_H__

#pragma once



#include <string>
@@ -23,6 +22,9 @@ 
#include <sysutils/FrameworkCommand.h>

#include <sysutils/FrameworkListener.h>



struct addrinfo;

struct hostent;



namespace android {

namespace net {
@@ -146,5 +148,3 @@ class DnsProxyListener : public FrameworkListener { 


}  // namespace net

}  // namespace android
 


#endif

DnsResolver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
#include <android-base/logging.h>

#include <android-base/properties.h>



#include <resolv.h>

#include "DnsProxyListener.h"

#include "DnsResolverService.h"

#include "resolv_private.h"

#include "netd_resolv/resolv.h"

#include "res_debug.h"



bool resolv_init(const ResolverNetdCallbacks* callbacks) {

    android::base::InitLogging(/*argv=*/nullptr);

ResolverController.cpp

+1 −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/resolv.h"

#include "netd_resolv/stats.h"

#include "resolv_cache.h"



using namespace std::placeholders;

using aidl::android::net::ResolverParamsParcel;