The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-29 17:16:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle SSL_ERROR_WANT_WRITE too in the NET_SSL_READ ioctl handler (+ cleanup)

Browse Source
This commit is contained in:
Pierre Bourdon 2012-02-18 23:25:42 +01:00
parent 5fe49e4185
commit 959d116530
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
View File

@ -376,22 +376,37 @@ u32 CWII_IPC_HLE_Device_net_ssl::ExecuteCommandV(u32 _Parameter, SIOCtlVBuffer C
{ {
SSL* ssl = sslfds[sslID]; SSL* ssl = sslfds[sslID];
returnValue = SSL_read(ssl, Memory::GetPointer(_BufferIn2), BufferInSize2); returnValue = SSL_read(ssl, Memory::GetPointer(_BufferIn2), BufferInSize2);
if (returnValue == -1){ if (returnValue == -1)
{
returnValue = -SSL_get_error(ssl, returnValue); returnValue = -SSL_get_error(ssl, returnValue);
INFO_LOG(WII_IPC_NET, "IOCTLV_NET_SSL_READ errorVal= %d", returnValue); INFO_LOG(WII_IPC_NET, "IOCTLV_NET_SSL_READ errorVal= %d", returnValue);
} }
if (returnValue == -1)
// According to OpenSSL docs, all TLS calls (including reads) can cause
// writing on a socket, so we need to handle SSL_ERROR_WANT_WRITE too
// (which happens when OpenSSL writes on a nonblocking busy socket). The
// Wii does not like -SSL_ERROR_WANT_WRITE though, so we convert it to
// a read error.
if (returnValue == -SSL_ERROR_WANT_WRITE)
returnValue = -SSL_ERROR_WANT_READ; returnValue = -SSL_ERROR_WANT_READ;
if (returnValue == -5){
if (returnValue == -SSL_ERROR_SYSCALL)
{
#ifdef _WIN32 #ifdef _WIN32
int errorCode = WSAGetLastError(); int errorCode = WSAGetLastError();
if (errorCode == 10057){ bool notConnected = (errorCode == WSAENOTCONN);
#else
int errorCode = errno;
bool notConnected = (errorCode == ENOTCONN);
#endif
if (notConnected)
{
returnValue = -SSL_ERROR_WANT_READ; returnValue = -SSL_ERROR_WANT_READ;
}else{ }
else
{
INFO_LOG(WII_IPC_NET, "IOCTLV_NET_SSL_READ ERRORCODE= %d", errorCode); INFO_LOG(WII_IPC_NET, "IOCTLV_NET_SSL_READ ERRORCODE= %d", errorCode);
} }
#endif
} }
Memory::Write_U32(returnValue, _BufferIn); Memory::Write_U32(returnValue, _BufferIn);
} }