Add a fix to our SFML from the current svn version of SFML.
Its meant to fix a problem when the connection timed out it used to return that it had connected. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4751 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
50139a394b
commit
9f387f5cf3
|
@ -131,11 +131,22 @@ Socket::Status SocketTCP::Connect(unsigned short Port, const IPAddress& HostAddr
|
||||||
Time.tv_sec = static_cast<long>(Timeout);
|
Time.tv_sec = static_cast<long>(Timeout);
|
||||||
Time.tv_usec = (static_cast<long>(Timeout * 1000) % 1000) * 1000;
|
Time.tv_usec = (static_cast<long>(Timeout * 1000) % 1000) * 1000;
|
||||||
|
|
||||||
// Wait for something to write on our socket (would mean the connection has been accepted)
|
// Wait for something to write on our socket (which means that the connection request has returned)
|
||||||
if (select(static_cast<int>(mySocket + 1), NULL, &Selector, NULL, &Time) > 0)
|
if (select(static_cast<int>(mySocket + 1), NULL, &Selector, NULL, &Time) > 0)
|
||||||
{
|
{
|
||||||
// Connection succeeded
|
// At this point the connection may have been either accepted or refused.
|
||||||
Status = Socket::Done;
|
// To know whether it's a success or a failure, we try to retrieve the name of the connected peer
|
||||||
|
SocketHelper::LengthType Size = sizeof(SockAddr);
|
||||||
|
if (getpeername(mySocket, reinterpret_cast<sockaddr*>(&SockAddr), &Size) != -1)
|
||||||
|
{
|
||||||
|
// Connection accepted
|
||||||
|
Status = Socket::Done;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Connection failed
|
||||||
|
Status = SocketHelper::GetErrorStatus();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue