birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverting the debugging code I was using to narrow down the problem on Jenkins now that the issue was fixed by PR-4946

Browse Source 
Signed-off-by: Gene Walters <genewalt@amazon.com>
This commit is contained in:
Gene Walters
2021-10-25 14:46:03 -07:00
parent c9a02e3c8a
commit 48c438f469
5 changed files with 7 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp
-5
View File
@@ -79,8 +79,6 @@ namespace AzNetworking
ConnectionId TcpNetworkInterface::Connect(const IpAddress& remoteAddress)
{
AZLOG_INFO("Attemping TcpNetworkInterface::Connect")
const ConnectionId connectionId = m_connectionSet.GetNextConnectionId();
AZStd::unique_ptr<TcpConnection> connection = AZStd::make_unique<TcpConnection>(connectionId, remoteAddress, *this, m_trustZone, net_TcpUseEncryption);
AZ_Assert(connection->GetConnectionRole() == ConnectionRole::Connector, "Invalid role for connection");
@@ -89,9 +87,6 @@ namespace AzNetworking
TcpSocket* tcpSocket = connection->GetTcpSocket();
if (tcpSocket == nullptr)
{
AZLOG_ERROR(
"TcpNetworkInterface::Connect tcpSocket is null! How can this be? Returning InvalidConnectionId")
return InvalidConnectionId;
}
Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpSocket.cpp
+3 -20
View File
@@ -68,31 +68,14 @@ namespace AzNetworking
{
Close();
if (!SocketCreateInternal())
if (!SocketCreateInternal()
|| !BindSocketForConnectInternal(address)
|| !(SetSocketNonBlocking(m_socketFd) && SetSocketNoDelay(m_socketFd)))
{
AZ_Warning("TcpSocket", false, "Tcp::Connect failed. SocketCreateInternal is false");
Close();
return false;
}
if (!BindSocketForConnectInternal(address))
{
AZ_Warning("TcpSocket", false, "Tcp::Connect failed. BindSocketForConnectInternal is false");
Close();
return false;
}
if (!(SetSocketNonBlocking(m_socketFd) && SetSocketNoDelay(m_socketFd)))
{
AZ_Warning("TcpSocket", false, "Tcp::Connect failed. SetSocketNonBlocking and SetSocketNoDelay is false");
Close();
return false;
}
return true;
}