procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

calling connectTcp/Http even if _conn4 / _conn6 were already nulled

This commit is contained in:
John Preston 2016-03-14 12:48:53 +03:00
parent 91a2d6b02e
commit eb728fb36e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Telegram/SourceFiles/mtproto/mtpConnection.cpp
View File

@ -1294,7 +1294,7 @@ void MTProtoConnectionPrivate::createConn(bool createIPv4, bool createIPv6) {
void MTProtoConnectionPrivate::destroyConn(MTPabstractConnection **conn) { void MTProtoConnectionPrivate::destroyConn(MTPabstractConnection **conn) {
if (conn) { if (conn) {
MTPabstractConnection *toDisconnect = 0; MTPabstractConnection *toDisconnect = nullptr;
{ {
QWriteLocker lock(&stateConnMutex); QWriteLocker lock(&stateConnMutex);
@ -1305,7 +1305,7 @@ void MTProtoConnectionPrivate::destroyConn(MTPabstractConnection **conn) {
disconnect(*conn, SIGNAL(error(bool)), 0, 0); disconnect(*conn, SIGNAL(error(bool)), 0, 0);
disconnect(*conn, SIGNAL(receivedData()), 0, 0); disconnect(*conn, SIGNAL(receivedData()), 0, 0);
disconnect(*conn, SIGNAL(receivedSome()), 0, 0); disconnect(*conn, SIGNAL(receivedSome()), 0, 0);
*conn = 0; *conn = nullptr;
} }
} }
if (toDisconnect) { if (toDisconnect) {
@ -1315,7 +1315,7 @@ void MTProtoConnectionPrivate::destroyConn(MTPabstractConnection **conn) {
} else { } else {
destroyConn(&_conn4); destroyConn(&_conn4);
destroyConn(&_conn6); destroyConn(&_conn6);
_conn = 0; _conn = nullptr;
} }
} }
@ -1324,9 +1324,9 @@ MTProtoConnectionPrivate::MTProtoConnectionPrivate(QThread *thread, MTProtoConne
, _needSessionReset(false) , _needSessionReset(false)
, dc(_dc) , dc(_dc)
, _owner(owner) , _owner(owner)
, _conn(0) , _conn(nullptr)
, _conn4(0) , _conn4(nullptr)
, _conn6(0) , _conn6(nullptr)
, retryTimeout(1) , retryTimeout(1)
, oldConnection(true) , oldConnection(true)
, _waitForReceived(MTPMinReceiveDelay) , _waitForReceived(MTPMinReceiveDelay)
@ -2072,17 +2072,17 @@ void MTProtoConnectionPrivate::socketStart(bool afterConfig) {
if (!noIPv6) DEBUG_LOG(("MTP Info: creating IPv6 connection to [%1]:%2 (tcp) and [%3]:%4 (http)..").arg(ip[IPv6address][TcpProtocol].c_str()).arg(port[IPv6address][TcpProtocol]).arg(ip[IPv4address][HttpProtocol].c_str()).arg(port[IPv4address][HttpProtocol])); if (!noIPv6) DEBUG_LOG(("MTP Info: creating IPv6 connection to [%1]:%2 (tcp) and [%3]:%4 (http)..").arg(ip[IPv6address][TcpProtocol].c_str()).arg(port[IPv6address][TcpProtocol]).arg(ip[IPv4address][HttpProtocol].c_str()).arg(port[IPv4address][HttpProtocol]));
_waitForConnectedTimer.start(_waitForConnected); _waitForConnectedTimer.start(_waitForConnected);
if (_conn4) { if (auto conn = _conn4) {
connect(_conn4, SIGNAL(connected()), this, SLOT(onConnected4())); connect(conn, SIGNAL(connected()), this, SLOT(onConnected4()));
connect(_conn4, SIGNAL(disconnected()), this, SLOT(onDisconnected4())); connect(conn, SIGNAL(disconnected()), this, SLOT(onDisconnected4()));
_conn4->connectTcp(ip[IPv4address][TcpProtocol].c_str(), port[IPv4address][TcpProtocol], flags[IPv4address][TcpProtocol]); conn->connectTcp(ip[IPv4address][TcpProtocol].c_str(), port[IPv4address][TcpProtocol], flags[IPv4address][TcpProtocol]);
_conn4->connectHttp(ip[IPv4address][HttpProtocol].c_str(), port[IPv4address][HttpProtocol], flags[IPv4address][HttpProtocol]); conn->connectHttp(ip[IPv4address][HttpProtocol].c_str(), port[IPv4address][HttpProtocol], flags[IPv4address][HttpProtocol]);
} }
if (_conn6) { if (auto conn = _conn6) {
connect(_conn6, SIGNAL(connected()), this, SLOT(onConnected6())); connect(conn, SIGNAL(connected()), this, SLOT(onConnected6()));
connect(_conn6, SIGNAL(disconnected()), this, SLOT(onDisconnected6())); connect(conn, SIGNAL(disconnected()), this, SLOT(onDisconnected6()));
_conn6->connectTcp(ip[IPv6address][TcpProtocol].c_str(), port[IPv6address][TcpProtocol], flags[IPv6address][TcpProtocol]); conn->connectTcp(ip[IPv6address][TcpProtocol].c_str(), port[IPv6address][TcpProtocol], flags[IPv6address][TcpProtocol]);
_conn6->connectHttp(ip[IPv6address][HttpProtocol].c_str(), port[IPv6address][HttpProtocol], flags[IPv6address][HttpProtocol]); conn->connectHttp(ip[IPv6address][HttpProtocol].c_str(), port[IPv6address][HttpProtocol], flags[IPv6address][HttpProtocol]);
} }
} }