AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-10 16:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

3DS: Try to fix not connecting to server on real hardware

Browse Source
This commit is contained in:
UnknownShadow200 2023-08-17 22:25:39 +10:00
parent 7949544525
commit f32fcb1c00
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Platform_3DS.c
View File

@ -34,8 +34,8 @@
const cc_result ReturnCode_FileShareViolation = 1000000000; /* TODO: not used apparently */ const cc_result ReturnCode_FileShareViolation = 1000000000; /* TODO: not used apparently */
const cc_result ReturnCode_FileNotFound = ENOENT; const cc_result ReturnCode_FileNotFound = ENOENT;
const cc_result ReturnCode_SocketInProgess = EINPROGRESS; const cc_result ReturnCode_SocketInProgess = -26;
const cc_result ReturnCode_SocketWouldBlock = EWOULDBLOCK; const cc_result ReturnCode_SocketWouldBlock = -6;
const cc_result ReturnCode_DirectoryExists = EEXIST; const cc_result ReturnCode_DirectoryExists = EEXIST;
const char* Platform_AppNameSuffix = " 3DS"; const char* Platform_AppNameSuffix = " 3DS";
@ -380,8 +380,6 @@ static cc_result Socket_Poll(cc_socket s, int mode, cc_bool* success) {
int flags = mode == SOCKET_POLL_READ ? (POLLIN | POLLHUP) : POLLOUT; int flags = mode == SOCKET_POLL_READ ? (POLLIN | POLLHUP) : POLLOUT;
*success = (pfd.revents & flags) != 0; *success = (pfd.revents & flags) != 0;
int ret_events = pfd.revents;
Platform_Log2("POLL: %h (%h)", &ret_events, &flags);
return 0; return 0;
} }
@ -394,9 +392,12 @@ cc_result Socket_CheckWritable(cc_socket s, cc_bool* writable) {
cc_result res = Socket_Poll(s, SOCKET_POLL_WRITE, writable); cc_result res = Socket_Poll(s, SOCKET_POLL_WRITE, writable);
if (res || *writable) return res; if (res || *writable) return res;
/* https://stackoverflow.com/questions/29479953/so-error-value-after-successful-socket-operation */ // Actual 3DS hardware returns EINPROGRESS if connect is still in progress
// Which is different from POSIX:
// https://stackoverflow.com/questions/29479953/so-error-value-after-successful-socket-operation
getsockopt(s, SOL_SOCKET, SO_ERROR, &res, &resultSize); getsockopt(s, SOL_SOCKET, SO_ERROR, &res, &resultSize);
Platform_Log1("--write poll failed-- = %i", &res); Platform_Log1("--write poll failed-- = %i", &res);
if (res == ReturnCode_SocketInProgess) res = 0;
return res; return res;
} }