Merge "Move private headers out of /include folder" am: 6ba673b557 (8333f79a) · Commits · e / os / android_packages_modules_DnsResolver

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;

+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

+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/stats.h"
		#include "resolv_cache.h"
		#include "stats.h"

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@

		#pragma once

		#include "params.h"

		#include <arpa/nameser.h>
		#include <netinet/in.h>

		@@ -120,6 +118,8 @@ struct ResolverNetdCallbacks {

		#define TAG_SYSTEM_DNS 0xFFFFFF82

		#define LIBNETD_RESOLV_PUBLIC extern "C" [[gnu::visibility("default")]]

		LIBNETD_RESOLV_PUBLIC bool resolv_has_nameservers(unsigned netid);

		// Set callbacks and bring DnsResolver up.

+1 −5

Original line number	Diff line number	Diff line
		@@ -26,11 +26,9 @@
		* SUCH DAMAGE.
		*/

		#ifndef NETD_RESOLV_RESOLV_STUB_H
		#define NETD_RESOLV_RESOLV_STUB_H
		#pragma once

		#include "resolv.h"
		#include "stats.h"

		// Struct containing function pointers for every function exported by libnetd_resolv.
		extern struct ResolvStub {
		@@ -44,5 +42,3 @@ extern struct ResolvStub {
		} RESOLV_STUB;

		int resolv_stub_init();

		#endif // NETD_RESOLV_RESOLV_STUB_H