From 4e858ba839ddcb93fa1ed8fae2064aa7d2633f00 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 May 2018 11:36:12 +0300
Subject: [PATCH] Improve connections debug logs.

---
 Telegram/SourceFiles/mtproto/connection.cpp       |  3 +++
 Telegram/SourceFiles/mtproto/connection_http.cpp  |  7 ++++---
 .../SourceFiles/mtproto/connection_resolving.cpp  | 12 ++++++++++++
 Telegram/SourceFiles/mtproto/connection_tcp.cpp   | 15 ++++++++++++++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp
index 426d051ad..3515d93e8 100644
--- a/Telegram/SourceFiles/mtproto/connection.cpp
+++ b/Telegram/SourceFiles/mtproto/connection.cpp
@@ -1144,6 +1144,9 @@ void ConnectionPrivate::connectToServer(bool afterConfig) {
 		});
 		return;
 	}
+	DEBUG_LOG(("Connection Info: Connecting to %1 with %2 test connections."
+		).arg(_shiftedDcId
+		).arg(_testConnections.size()));
 
 	if (!_startedConnectingAt) {
 		_startedConnectingAt = getms(true);
diff --git a/Telegram/SourceFiles/mtproto/connection_http.cpp b/Telegram/SourceFiles/mtproto/connection_http.cpp
index b53bd5f90..7029dacf1 100644
--- a/Telegram/SourceFiles/mtproto/connection_http.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_http.cpp
@@ -71,7 +71,6 @@ void HttpConnection::connectToServer(
 		const bytes::vector &protocolSecret,
 		int16 protocolDcId) {
 	_address = address;
-	TCP_LOG(("HTTP Info: address is %1").arg(url().toDisplayString()));
 	connect(
 		&_manager,
 		&QNetworkAccessManager::finished,
@@ -80,8 +79,10 @@ void HttpConnection::connectToServer(
 
 	mtpBuffer buffer(preparePQFake(_checkNonce));
 
-	DEBUG_LOG(("Connection Info: "
-		"sending fake req_pq through HTTP transport to '%1'").arg(address));
+	DEBUG_LOG(("HTTP Info: "
+		"dc:%1 - Sending fake req_pq to '%2'"
+		).arg(protocolDcId
+		).arg(url().toDisplayString()));
 
 	_pingTime = getms();
 	sendData(buffer);
diff --git a/Telegram/SourceFiles/mtproto/connection_resolving.cpp b/Telegram/SourceFiles/mtproto/connection_resolving.cpp
index 1cb030af3..5f528a7a0 100644
--- a/Telegram/SourceFiles/mtproto/connection_resolving.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_resolving.cpp
@@ -70,6 +70,12 @@ void ResolvingConnection::setChild(ConnectionPointer &&child) {
 		&AbstractConnection::disconnected,
 		this,
 		&ResolvingConnection::handleDisconnected);
+	DEBUG_LOG(("Resolving Info: dc:%1 proxy '%2' got new child '%3'"
+		).arg(_protocolDcId
+		).arg(_proxy.host + ':' + QString::number(_proxy.port)
+		).arg((_ipIndex >= 0 && _ipIndex < _proxy.resolvedIPs.size())
+			? _proxy.resolvedIPs[_ipIndex]
+			: _proxy.host));
 	if (_protocolDcId) {
 		_child->connectToServer(
 			_address,
@@ -213,6 +219,12 @@ void ResolvingConnection::connectToServer(
 	_port = port;
 	_protocolSecret = protocolSecret;
 	_protocolDcId = protocolDcId;
+	DEBUG_LOG(("Resolving Info: dc:%1 proxy '%2' connects a child '%3'"
+		).arg(_protocolDcId
+		).arg(_proxy.host +':' + QString::number(_proxy.port)
+		).arg((_ipIndex >= 0 && _ipIndex < _proxy.resolvedIPs.size())
+			? _proxy.resolvedIPs[_ipIndex]
+			: _proxy.host));
 	return _child->connectToServer(
 		address,
 		port,
diff --git a/Telegram/SourceFiles/mtproto/connection_tcp.cpp b/Telegram/SourceFiles/mtproto/connection_tcp.cpp
index 2a4ea0286..b8d4fd178 100644
--- a/Telegram/SourceFiles/mtproto/connection_tcp.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_tcp.cpp
@@ -231,7 +231,10 @@ void TcpConnection::socketConnected() {
 	if (_status == Status::Waiting) {
 		mtpBuffer buffer(preparePQFake(_checkNonce));
 
-		DEBUG_LOG(("Connection Info: sending fake req_pq through TCP transport to %1").arg(_address));
+		DEBUG_LOG(("TCP Info: "
+			"dc:%1 - Sending fake req_pq to '%2'"
+			).arg(_protocolDcId
+			).arg(_address + ':' + QString::number(_port)));
 
 		if (_timeout < 0) _timeout = -_timeout;
 		_timeoutTimer.callOnce(_timeout);
@@ -390,10 +393,20 @@ void TcpConnection::connectToServer(
 		_address = _proxy.host;
 		_port = _proxy.port;
 		_protocolSecret = ProtocolSecretFromPassword(_proxy.password);
+
+		DEBUG_LOG(("TCP Info: "
+			"dc:%1 - Connecting to proxy '%2'"
+			).arg(protocolDcId
+			).arg(_address + ':' + QString::number(_port)));
 	} else {
 		_address = address;
 		_port = port;
 		_protocolSecret = protocolSecret;
+
+		DEBUG_LOG(("TCP Info: "
+			"dc:%1 - Connecting to '%2'"
+			).arg(protocolDcId
+			).arg(_address + ':' + QString::number(_port)));
 	}
 	_protocolDcId = protocolDcId;