Merge changes from topic "libnetd_resolv-logging" (9cca7726) · Commits · e / os / android_packages_modules_DnsResolver

DnsResolver.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		bool resolv_init(const ResolverNetdCallbacks& callbacks) {
		android::base::InitLogging(/argv=/nullptr);
		android::base::SetDefaultTag("libnetd_resolv");
		LOG(INFO) << __func__ << "Initializing resolver";
		LOG(INFO) << __func__ << ": Initializing resolver";
		const std::string logSeverityStr =
		android::base::GetProperty("persist.sys.nw_dns_resolver_log", "WARNING");
		android::base::SetMinimumLogSeverity(logSeverityStrToEnum(logSeverityStr));
		@@ -61,16 +61,16 @@ DnsResolver* DnsResolver::getInstance() {

		bool DnsResolver::start() {
		if (!verifyCallbacks()) {
		LOG(ERROR) << __func__ << "Callback verification failed";
		LOG(ERROR) << __func__ << ": Callback verification failed";
		return false;
		}
		if (mDnsProxyListener.startListener()) {
		PLOG(ERROR) << __func__ << "Unable to start DnsProxyListener";
		PLOG(ERROR) << __func__ << ": Unable to start DnsProxyListener";
		return false;
		}
		binder_status_t ret;
		if ((ret = DnsResolverService::start()) != STATUS_OK) {
		LOG(ERROR) << __func__ << "Unable to start DnsResolverService: " << ret;
		LOG(ERROR) << __func__ << ": Unable to start DnsResolverService: " << ret;
		return false;
		}
		return true;

+13 −6

Original line number	Diff line number	Diff line
		@@ -96,7 +96,6 @@
		*/

		#define LOG_TAG "res_debug"
		#define DBG 0

		#include <sys/param.h>
		#include <sys/socket.h>
		@@ -118,6 +117,14 @@

		#include "resolv_private.h"

		// Default to disabling verbose logging unless overridden by Android.bp
		// for debuggable builds.
		//
		// NOTE: Verbose resolver logs could contain PII -- do NOT enable in production builds
		#ifndef RESOLV_ALLOW_VERBOSE_LOGGING
		#define RESOLV_ALLOW_VERBOSE_LOGGING 0
		#endif

		struct res_sym {
		int number; /* Identifying number, like T_MX */
		const char* name; /* Its symbolic name, like "MX" */
		@@ -502,11 +509,11 @@ const char* p_rcode(int rcode) {
		android::base::LogSeverity logSeverityStrToEnum(const std::string& logSeverityStr) {
		android::base::LogSeverity logSeverityEnum;

		if (logSeverityStr == "DEBUG") {
		if (logSeverityStr == "VERBOSE") {
		// * enable verbose logging only when DBG is set. It prints sensitive data *
		if (DBG)
		logSeverityEnum = android::base::VERBOSE;
		else
		logSeverityEnum =
		RESOLV_ALLOW_VERBOSE_LOGGING ? android::base::VERBOSE : android::base::DEBUG;
		} else if (logSeverityStr == "DEBUG") {
		logSeverityEnum = android::base::DEBUG;
		} else if (logSeverityStr == "INFO") {
		logSeverityEnum = android::base::INFO;