Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-28 02:32:08 +00:00
Code Issues Projects Releases Wiki Activity

Uthernet2: use fcntl for better compatibility with MacOS. (#1269)

Browse Source
This commit is contained in:
Andrea 2024-03-02 12:34:38 +00:00 committed by GitHub
parent 972ab3998b
commit a85c9bfc07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/Uthernet2.cpp
View File

@ -72,19 +72,12 @@ typedef int socklen_t;
#include <arpa/inet.h>
#include <poll.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <errno.h>
#endif
// fix SOCK_NONBLOCK for e.g. macOS
#ifndef SOCK_NONBLOCK
// DISCALIMER
// totally untested, use at your own risk
#include <fcntl.h>
#define SOCK_NONBLOCK O_NONBLOCK
#endif
// Dest MAC + Source MAC + Ether Type
#define ETH_MINIMUM_SIZE (6 + 6 + 2)
@ -912,11 +905,8 @@ void Uthernet2::resetRXTXBuffers(const size_t i)
void Uthernet2::openSystemSocket(const size_t i, const int type, const int protocol, const int status)
{
Socket &s = mySockets[i];
#ifdef _MSC_VER
const Socket::socket_t fd = socket(AF_INET, type, protocol);
#else
const Socket::socket_t fd = socket(AF_INET, type | SOCK_NONBLOCK, protocol);
#endif
if (fd == INVALID_SOCKET)
{
#ifdef U2_LOG_STATE
@ -929,9 +919,23 @@ void Uthernet2::openSystemSocket(const size_t i, const int type, const int proto
{
#ifdef _MSC_VER
u_long on = 1;
ioctlsocket(fd, FIONBIO, &on);
const int res = ioctlsocket(fd, FIONBIO, &on);
#else
const int current = fcntl(fd, F_GETFL);
const int res = fcntl(fd, F_SETFL, current | O_NONBLOCK);
#endif
s.setFD(fd, status);
if (res)
{
#ifdef U2_LOG_STATE
const char *proto = (status == W5100_SN_SR_SOCK_UDP) ? "UDP" : "TCP";
LogFileOutput("U2: %s[%" SIZE_T_FMT "]: socket error: %" ERROR_FMT "\n", proto, i, STRERROR(sock_error()));
#endif
s.clearFD();
}
else
{
s.setFD(fd, status);
}
}
}