Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 3DS configuration #13

Merged
merged 4 commits into from
Nov 10, 2023
Merged

Add 3DS configuration #13

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
412dbbd
Adds unix definitions for the 3DS
Oct 27, 2023
1b984a4
Merge pull request #1 from zoeyjodon/n3ds-build
zoeyjodon Nov 9, 2023
134a6f1
Simpify INET6 disable for 3DS
Nov 9, 2023
b376137
Remove extra __3DS__ checks
Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 59 additions & 28 deletions unix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/**
@file unix.c
@brief ENet Unix system specific functions
*/
Expand Down Expand Up @@ -109,6 +109,37 @@
#ifndef NO_MSGAPI
#define NO_MSGAPI 1
#endif
#elif defined(__3DS__)
#ifdef AF_INET6
#undef AF_INET6
#endif
#ifndef HAS_POLL
#define HAS_POLL 1
#endif
#ifndef HAS_FCNTL
#define HAS_FCNTL 1
#endif
#ifndef HAS_IOCTL
#define HAS_IOCTL 1
#endif
#ifndef HAS_INET_PTON
#define HAS_INET_PTON 1
#endif
#ifndef HAS_INET_NTOP
#define HAS_INET_NTOP 1
#endif
#ifndef HAS_SOCKLEN_T
#define HAS_SOCKLEN_T 1
#endif
#ifndef HAS_GETADDRINFO
#define HAS_GETADDRINFO 1
#endif
#ifndef HAS_GETNAMEINFO
#define HAS_GETNAMEINFO 1
#endif
#ifndef NO_MSGAPI
#define NO_MSGAPI 1
#endif
#else
#ifndef HAS_IOCTL
#define HAS_IOCTL 1
Expand Down Expand Up @@ -159,9 +190,9 @@ enet_uint32
enet_host_random_seed (void)
{
struct timeval timeVal;

gettimeofday (& timeVal, NULL);

return (timeVal.tv_sec * 1000) ^ (timeVal.tv_usec / 1000);
}

Expand All @@ -181,7 +212,7 @@ enet_time_set (enet_uint32 newTimeBase)
struct timeval timeVal;

gettimeofday (& timeVal, NULL);

timeBase = timeVal.tv_sec * 1000 + timeVal.tv_usec / 1000 - newTimeBase;
}

Expand All @@ -201,7 +232,7 @@ enet_address_equal (ENetAddress * address1, ENetAddress * address2)
return sin1 -> sin_port == sin2 -> sin_port &&
sin1 -> sin_addr.s_addr == sin2 -> sin_addr.s_addr;
}
#ifdef AF_INET6
#if defined(AF_INET6) && !(defined(__3DS__))
cgutman marked this conversation as resolved.
Show resolved Hide resolved
case AF_INET6:
{
struct sockaddr_in6 *sin6a, *sin6b;
Expand All @@ -227,7 +258,7 @@ enet_address_set_port (ENetAddress * address, enet_uint16 port)
sin -> sin_port = ENET_HOST_TO_NET_16 (port);
return 0;
}
#ifdef AF_INET6
#if defined(AF_INET6) && !(defined(__3DS__))
else if (address -> address.ss_family == AF_INET6)
{
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) &address -> address;
Expand Down Expand Up @@ -268,9 +299,9 @@ enet_address_set_host (ENetAddress * address, const char * name)
{
memcpy (& address -> address, result -> ai_addr, result -> ai_addrlen);
address -> addressLength = result -> ai_addrlen;

freeaddrinfo (resultList);

return 0;
}

Expand Down Expand Up @@ -299,7 +330,7 @@ enet_socket_get_address (ENetSocket socket, ENetAddress * address)
return 0;
}

int
int
enet_socket_listen (ENetSocket socket, int backlog)
{
return listen (socket, backlog < 0 ? SOMAXCONN : backlog);
Expand Down Expand Up @@ -371,7 +402,7 @@ enet_socket_set_option (ENetSocket socket, ENetSocketOption option, int value)
result = setsockopt (socket, SOL_SOCKET, SO_SNDBUF, (char *) & value, sizeof (int));
break;

#ifndef __WIIU__
#if !defined(__WIIU__) && !defined(__3DS__)
case ENET_SOCKOPT_RCVTIMEO:
{
struct timeval timeVal;
Expand Down Expand Up @@ -472,10 +503,10 @@ enet_socket_accept (ENetSocket socket, ENetAddress * address)
if (address != NULL)
address -> addressLength = sizeof (address -> address);

result = accept (socket,
address != NULL ? (struct sockaddr *) & address -> address : NULL,
result = accept (socket,
address != NULL ? (struct sockaddr *) & address -> address : NULL,
address != NULL ? & address -> addressLength : NULL);

if (result == -1)
return ENET_SOCKET_NULL;

Expand Down Expand Up @@ -503,25 +534,25 @@ enet_socket_send (ENetSocket socket,
size_t bufferCount)
{
int sentLength;

#ifdef NO_MSGAPI
void* sendBuffer;
size_t sendLength;

if (bufferCount > 1)
{
size_t i;

sendLength = 0;
for (i = 0; i < bufferCount; i++)
{
sendLength += buffers[i].dataLength;
}

sendBuffer = malloc (sendLength);
if (sendBuffer == NULL)
return -1;

sendLength = 0;
for (i = 0; i < bufferCount; i++)
{
Expand All @@ -534,10 +565,10 @@ enet_socket_send (ENetSocket socket,
sendBuffer = buffers[0].data;
sendLength = buffers[0].dataLength;
}

sentLength = sendto (socket, sendBuffer, sendLength, MSG_NOSIGNAL,
(struct sockaddr *) & peerAddress -> address, peerAddress -> addressLength);

if (bufferCount > 1)
free(sendBuffer);
#else
Expand Down Expand Up @@ -597,7 +628,7 @@ enet_socket_send (ENetSocket socket,

sentLength = sendmsg (socket, & msgHdr, MSG_NOSIGNAL);
#endif

if (sentLength == -1)
{
if (errno == EWOULDBLOCK)
Expand All @@ -620,19 +651,19 @@ enet_socket_receive (ENetSocket socket,

#ifdef NO_MSGAPI
// This will ONLY work with a single buffer!

peerAddress -> addressLength = sizeof (peerAddress -> address);
recvLength = recvfrom (socket, buffers[0].data, buffers[0].dataLength, MSG_NOSIGNAL,
(struct sockaddr *) & peerAddress -> address, & peerAddress -> addressLength);

if (recvLength == -1)
{
if (errno == EWOULDBLOCK)
return 0;

return -1;
}

return recvLength;
#else
struct msghdr msgHdr;
Expand Down Expand Up @@ -719,7 +750,7 @@ enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeou
#ifdef HAS_POLL
struct pollfd pollSocket;
int pollCount;

pollSocket.fd = socket;
pollSocket.events = 0;

Expand Down Expand Up @@ -750,7 +781,7 @@ enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeou

if (pollSocket.revents & POLLOUT)
* condition |= ENET_SOCKET_WAIT_SEND;

if (pollSocket.revents & POLLIN)
* condition |= ENET_SOCKET_WAIT_RECEIVE;

Expand Down Expand Up @@ -782,7 +813,7 @@ enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeou

return 0;
}

return -1;
}

Expand Down