Snap for 6525876 from 227a22feb8b8242a4e18c37dd4da1c3566b680fc to rvc-d1-release (971342d9) · Commits · e / os / android_packages_modules_DnsResolver

Dns64Configuration.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -37,11 +37,13 @@

		namespace android {

		using android::base::StringPrintf;
		using android::net::NetworkDnsEventReported;
		using netdutils::DumpWriter;
		using netdutils::IPAddress;
		using netdutils::IPPrefix;
		using netdutils::ScopedAddrinfo;
		using netdutils::setThreadName;

		namespace net {

		@@ -64,7 +66,7 @@ void Dns64Configuration::startPrefixDiscovery(unsigned netId) {

		// Note that capturing \|cfg\| in this lambda creates a copy.
		std::thread discovery_thread([this, cfg, netId] {
		netdutils::setThreadName(android::base::StringPrintf("Nat64Pfx_%u", netId).c_str());
		setThreadName(StringPrintf("Nat64Pfx_%u", netId).c_str());

		// Make a mutable copy rather than mark the whole lambda mutable.
		// No particular reason.

DnsTlsDispatcher.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,10 @@ DnsTlsTransport::Response DnsTlsDispatcher::query(const DnsTlsServer& server, un
		const Slice query, const Slice ans, int* resplen,
		bool* connectTriggered) {
		int connectCounter;

		// TODO: This can cause the resolver to create multiple connections to the same DoT server
		// merely due to different mark, such as the bit explicitlySelected unset.
		// See if we can save them and just create one connection for one DoT server.
		const Key key = std::make_pair(mark, server);
		Transport* xport;
		{

DnsTlsSocket.cpp

+11 −19

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		#include "DnsTlsSessionCache.h"
		#include "IDnsTlsSocketObserver.h"

		#include <Fwmark.h>
		#include <android-base/logging.h>
		#include <android-base/stringprintf.h>
		#include <netdutils/SocketOption.h>
		@@ -49,9 +48,11 @@

		namespace android {

		using base::StringPrintf;
		using netdutils::enableSockopt;
		using netdutils::enableTcpKeepAlives;
		using netdutils::isOk;
		using netdutils::setThreadName;
		using netdutils::Slice;
		using netdutils::Status;

		@@ -70,13 +71,6 @@ int waitForWriting(int fd, int timeoutMs = -1) {
		return TEMP_FAILURE_RETRY(poll(&fds, 1, timeoutMs));
		}

		std::string markToFwmarkString(unsigned mMark) {
		Fwmark mark;
		mark.intValue = mMark;
		return android::base::StringPrintf("%d, %d, %d, %d, %d", mark.netId, mark.explicitlySelected,
		mark.protectedFromVpn, mark.permission, mark.uidBillingDone);
		}

		} // namespace

		Status DnsTlsSocket::tcpConnect() {
		@@ -243,9 +237,9 @@ bssl::UniquePtr<SSL> DnsTlsSocket::sslConnect(int fd) {
		}

		for (;;) {
		LOG(DEBUG) << " Calling SSL_connect with " << markToFwmarkString(mMark);
		LOG(DEBUG) << " Calling SSL_connect with mark 0x" << std::hex << mMark;
		int ret = SSL_connect(ssl.get());
		LOG(DEBUG) << " SSL_connect returned " << ret << " with " << markToFwmarkString(mMark);
		LOG(DEBUG) << " SSL_connect returned " << ret << " with mark 0x" << std::hex << mMark;
		if (ret == 1) break; // SSL handshake complete;

		const int ssl_err = SSL_get_error(ssl.get(), ret);
		@@ -255,8 +249,8 @@ bssl::UniquePtr<SSL> DnsTlsSocket::sslConnect(int fd) {
		// the TCP connection handshake, the device is waiting for the SSL handshake reply
		// from the server.
		if (int err = waitForReading(fd, mServer.connectTimeout.count()); err <= 0) {
		PLOG(WARNING) << "SSL_connect read error " << err << ", "
		<< markToFwmarkString(mMark);
		PLOG(WARNING) << "SSL_connect read error " << err << ", mark 0x" << std::hex
		<< mMark;
		return nullptr;
		}
		break;
		@@ -264,14 +258,14 @@ bssl::UniquePtr<SSL> DnsTlsSocket::sslConnect(int fd) {
		// If no application data is sent during the TCP connection handshake, the
		// device is waiting for the connection established to perform SSL handshake.
		if (int err = waitForWriting(fd, mServer.connectTimeout.count()); err <= 0) {
		PLOG(WARNING) << "SSL_connect write error " << err << ", "
		<< markToFwmarkString(mMark);
		PLOG(WARNING) << "SSL_connect write error " << err << ", mark 0x" << std::hex
		<< mMark;
		return nullptr;
		}
		break;
		default:
		PLOG(WARNING) << "SSL_connect ssl error =" << ssl_err << ", "
		<< markToFwmarkString(mMark);
		PLOG(WARNING) << "SSL_connect ssl error =" << ssl_err << ", mark 0x" << std::hex
		<< mMark;
		return nullptr;
		}
		}
		@@ -321,9 +315,7 @@ void DnsTlsSocket::loop() {
		std::deque<std::vector<uint8_t>> q;
		const int timeout_msecs = DnsTlsSocket::kIdleTimeout.count() * 1000;

		Fwmark mark;
		mark.intValue = mMark;
		netdutils::setThreadName(android::base::StringPrintf("TlsListen_%u", mark.netId).c_str());
		setThreadName(StringPrintf("TlsListen_%u", mMark & 0xffff).c_str());
		while (true) {
		// poll() ignores negative fds
		struct pollfd fds[2] = { { .fd = -1 }, { .fd = -1 } };

DnsTlsTransport.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@

		#include "DnsTlsTransport.h"

		#include <Fwmark.h>
		#include <android-base/logging.h>
		#include <android-base/stringprintf.h>
		#include <arpa/inet.h>
		@@ -28,6 +27,9 @@
		#include "DnsTlsSocketFactory.h"
		#include "IDnsTlsSocketFactory.h"

		using android::base::StringPrintf;
		using android::netdutils::setThreadName;

		namespace android {
		namespace net {

		@@ -112,9 +114,7 @@ void DnsTlsTransport::onClosed() {

		void DnsTlsTransport::doReconnect() {
		std::lock_guard guard(mLock);
		Fwmark mark;
		mark.intValue = mMark;
		netdutils::setThreadName(android::base::StringPrintf("TlsReconn_%u", mark.netId).c_str());
		setThreadName(StringPrintf("TlsReconn_%u", mMark & 0xffff).c_str());
		if (mClosing) {
		return;
		}

PrivateDnsConfiguration.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@
		#include "resolv_cache.h"
		#include "util.h"

		using android::base::StringPrintf;
		using android::netdutils::setThreadName;
		using std::chrono::milliseconds;

		namespace android {
		@@ -180,7 +182,7 @@ void PrivateDnsConfiguration::validatePrivateDnsProvider(const DnsTlsServer& ser

		// Note that capturing \|server\| and \|netId\| in this lambda create copies.
		std::thread validate_thread([this, server, netId, mark] {
		netdutils::setThreadName(android::base::StringPrintf("TlsVerify_%u", netId).c_str());
		setThreadName(StringPrintf("TlsVerify_%u", netId).c_str());

		// cat /proc/sys/net/ipv4/tcp_syn_retries yields "6".
		//