TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1952 from pacomont/Fix_Issue_#1951_TCPObject_is_broken_3.10

Browse source 
Fix issue #1951 tcp object is broken 3.10
This commit is contained in:
Areloch 2017-04-17 20:19:39 -05:00 • committed by GitHub
commit 130d08edd4
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Engine/source/platform/platformNet.cpp
View file

@ -824,17 +824,15 @@ NetSocket Net::openConnectTo(const char *addressString)
if (socketFd != InvalidSocketHandle) if (socketFd != InvalidSocketHandle)
{ {
setBlocking(handleFd, false); setBlocking(handleFd, false);
if (::connect(socketFd, (struct sockaddr *)&ipAddr, sizeof(ipAddr)) == -1 && if (::connect(socketFd, (struct sockaddr *)&ipAddr, sizeof(ipAddr)) == -1)
errno != EINPROGRESS)
{ {
error = PlatformNetState::getLastError(); Net::Error err = PlatformNetState::getLastError();
if (err != Net::WouldBlock)
if (error != Net::WouldBlock)
{ {
Con::errorf("Error connecting %s: %s", Con::errorf("Error connecting to %s: %u",
addressString, strerror(errno)); addressString, err);
closeSocket(handleFd); closeSocket(handleFd);
handleFd = NetSocket::INVALID; handleFd = NetSocket::INVALID;
} }
} }
} }
@ -855,14 +853,20 @@ NetSocket Net::openConnectTo(const char *addressString)
sockaddr_in6 ipAddr6; sockaddr_in6 ipAddr6;
NetAddressToIPSocket6(&address, &ipAddr6); NetAddressToIPSocket6(&address, &ipAddr6);
SOCKET socketFd = PlatformNetState::smReservedSocketList.activate(handleFd, AF_INET6, false, true); SOCKET socketFd = PlatformNetState::smReservedSocketList.activate(handleFd, AF_INET6, false, true);
if (::connect(socketFd, (struct sockaddr *)&ipAddr6, sizeof(ipAddr6)) == -1 && if (socketFd != InvalidSocketHandle)
errno != EINPROGRESS)
{ {
setBlocking(handleFd, false); setBlocking(handleFd, false);
Con::errorf("Error connecting %s: %s", if (::connect(socketFd, (struct sockaddr *)&ipAddr6, sizeof(ipAddr6)) == -1)
addressString, strerror(errno)); {
closeSocket(handleFd); Net::Error err = PlatformNetState::getLastError();
handleFd = NetSocket::INVALID; if (err != Net::WouldBlock)
{
Con::errorf("Error connecting to %s: %u",
addressString, err);
closeSocket(handleFd);
handleFd = NetSocket::INVALID;
}
}
} }
else else
{ {