From ae9002fe199517b109e5cc00139032cf4a2f3d02 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 6 Mar 2016 14:47:01 -0800 Subject: [PATCH] Protocol agnostic socket address to fix IPv6 and remove broadcast support --- host.c | 28 +---- include/enet/enet.h | 52 ++------- include/enet/win32.h | 1 + protocol.c | 12 +- unix.c | 270 +++++++++++++++---------------------------- win32.c | 219 +++++++++++++++++------------------ 6 files changed, 210 insertions(+), 372 deletions(-) diff --git a/host.c b/host.c index 3be6c09..29d8c35 100644 --- a/host.c +++ b/host.c @@ -61,7 +61,6 @@ enet_host_create (const ENetAddress * address, size_t peerCount, size_t channelL } enet_socket_set_option (host -> socket, ENET_SOCKOPT_NONBLOCK, 1); - enet_socket_set_option (host -> socket, ENET_SOCKOPT_BROADCAST, 1); enet_socket_set_option (host -> socket, ENET_SOCKOPT_RCVBUF, ENET_HOST_RECEIVE_BUFFER_SIZE); enet_socket_set_option (host -> socket, ENET_SOCKOPT_SNDBUF, ENET_HOST_SEND_BUFFER_SIZE); @@ -87,8 +86,7 @@ enet_host_create (const ENetAddress * address, size_t peerCount, size_t channelL host -> commandCount = 0; host -> bufferCount = 0; host -> checksum = NULL; - host -> receivedAddress.host = ENET_HOST_ANY; - host -> receivedAddress.port = 0; + memset(& host -> receivedAddress, 0, sizeof (host -> receivedAddress)); host -> receivedData = NULL; host -> receivedDataLength = 0; @@ -252,30 +250,6 @@ enet_host_connect (ENetHost * host, const ENetAddress * address, size_t channelC return currentPeer; } -/** Queues a packet to be sent to all peers associated with the host. - @param host host on which to broadcast the packet - @param channelID channel on which to broadcast - @param packet packet to broadcast -*/ -void -enet_host_broadcast (ENetHost * host, enet_uint8 channelID, ENetPacket * packet) -{ - ENetPeer * currentPeer; - - for (currentPeer = host -> peers; - currentPeer < & host -> peers [host -> peerCount]; - ++ currentPeer) - { - if (currentPeer -> state != ENET_PEER_STATE_CONNECTED) - continue; - - enet_peer_send (currentPeer, channelID, packet); - } - - if (packet -> referenceCount == 0) - enet_packet_destroy (packet); -} - /** Sets the packet compressor the host should use to compress and decompress packets. @param host host to enable or disable compression for @param compressor callbacks for for the packet compressor; if NULL, then compression is disabled diff --git a/include/enet/enet.h b/include/enet/enet.h index 9389400..0d14cb0 100644 --- a/include/enet/enet.h +++ b/include/enet/enet.h @@ -55,14 +55,13 @@ typedef enum _ENetSocketWait typedef enum _ENetSocketOption { ENET_SOCKOPT_NONBLOCK = 1, - ENET_SOCKOPT_BROADCAST = 2, - ENET_SOCKOPT_RCVBUF = 3, - ENET_SOCKOPT_SNDBUF = 4, - ENET_SOCKOPT_REUSEADDR = 5, - ENET_SOCKOPT_RCVTIMEO = 6, - ENET_SOCKOPT_SNDTIMEO = 7, - ENET_SOCKOPT_ERROR = 8, - ENET_SOCKOPT_NODELAY = 9 + ENET_SOCKOPT_RCVBUF, + ENET_SOCKOPT_SNDBUF, + ENET_SOCKOPT_REUSEADDR, + ENET_SOCKOPT_RCVTIMEO, + ENET_SOCKOPT_SNDTIMEO, + ENET_SOCKOPT_ERROR, + ENET_SOCKOPT_NODELAY, } ENetSocketOption; typedef enum _ENetSocketShutdown @@ -72,24 +71,13 @@ typedef enum _ENetSocketShutdown ENET_SOCKET_SHUTDOWN_READ_WRITE = 2 } ENetSocketShutdown; -#define ENET_HOST_ANY 0 -#define ENET_HOST_BROADCAST 0xFFFFFFFFU -#define ENET_PORT_ANY 0 - /** * Portable internet address structure. - * - * The host must be specified in network byte-order, and the port must be in host - * byte-order. The constant ENET_HOST_ANY may be used to specify the default - * server host. The constant ENET_HOST_BROADCAST may be used to specify the - * broadcast address (255.255.255.255). This makes sense for enet_host_connect, - * but not for enet_host_create. Once a server responds to a broadcast, the - * address is updated from ENET_HOST_BROADCAST to the server's actual IP address. */ typedef struct _ENetAddress { - enet_uint32 host; - enet_uint16 port; + socklen_t addressLength; + struct sockaddr_storage address; } ENetAddress; /** @@ -348,7 +336,6 @@ typedef int (ENET_CALLBACK * ENetInterceptCallback) (struct _ENetHost * host, st @sa enet_host_connect() @sa enet_host_service() @sa enet_host_flush() - @sa enet_host_broadcast() @sa enet_host_compress() @sa enet_host_compress_with_range_coder() @sa enet_host_channel_limit() @@ -519,25 +506,7 @@ ENET_API int enet_socketset_select (ENetSocket, ENetSocketSet *, ENetSock */ ENET_API int enet_address_set_host (ENetAddress * address, const char * hostName); -/** Gives the printable form of the IP address specified in the address parameter. - @param address address printed - @param hostName destination for name, must not be NULL - @param nameLength maximum length of hostName. - @returns the null-terminated name of the host in hostName on success - @retval 0 on success - @retval < 0 on failure -*/ -ENET_API int enet_address_get_host_ip (const ENetAddress * address, char * hostName, size_t nameLength); - -/** Attempts to do a reverse lookup of the host field in the address parameter. - @param address address used for reverse lookup - @param hostName destination for name, must not be NULL - @param nameLength maximum length of hostName. - @returns the null-terminated name of the host in hostName on success - @retval 0 on success - @retval < 0 on failure -*/ -ENET_API int enet_address_get_host (const ENetAddress * address, char * hostName, size_t nameLength); +ENET_API int enet_address_set_port (ENetAddress * address, enet_uint16 port); /** @} */ @@ -552,7 +521,6 @@ ENET_API ENetPeer * enet_host_connect (ENetHost *, const ENetAddress *, size_t, ENET_API int enet_host_check_events (ENetHost *, ENetEvent *); ENET_API int enet_host_service (ENetHost *, ENetEvent *, enet_uint32); ENET_API void enet_host_flush (ENetHost *); -ENET_API void enet_host_broadcast (ENetHost *, enet_uint8, ENetPacket *); ENET_API void enet_host_compress (ENetHost *, const ENetCompressor *); ENET_API int enet_host_compress_with_range_coder (ENetHost * host); ENET_API void enet_host_channel_limit (ENetHost *, size_t); diff --git a/include/enet/win32.h b/include/enet/win32.h index e73ca9d..7a27dbb 100644 --- a/include/enet/win32.h +++ b/include/enet/win32.h @@ -16,6 +16,7 @@ #include #include +#include typedef SOCKET ENetSocket; diff --git a/protocol.c b/protocol.c index 29d6487..fd62f8c 100644 --- a/protocol.c +++ b/protocol.c @@ -298,10 +298,9 @@ enet_protocol_handle_connect (ENetHost * host, ENetProtocolHeader * header, ENet } else if (currentPeer -> state != ENET_PEER_STATE_CONNECTING && - currentPeer -> address.host == host -> receivedAddress.host) + enet_address_equal (& currentPeer -> address, & host -> receivedAddress)) { - if (currentPeer -> address.port == host -> receivedAddress.port && - currentPeer -> connectID == command -> connect.connectID) + if (currentPeer -> connectID == command -> connect.connectID) return NULL; ++ duplicatePeers; @@ -1010,9 +1009,7 @@ enet_protocol_handle_incoming_commands (ENetHost * host, ENetEvent * event) if (peer -> state == ENET_PEER_STATE_DISCONNECTED || peer -> state == ENET_PEER_STATE_ZOMBIE || - ((host -> receivedAddress.host != peer -> address.host || - host -> receivedAddress.port != peer -> address.port) && - peer -> address.host != ENET_HOST_BROADCAST) || + ! enet_address_equal(& host -> receivedAddress, & peer -> address) || (peer -> outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID && sessionID != peer -> incomingSessionID)) return 0; @@ -1054,8 +1051,7 @@ enet_protocol_handle_incoming_commands (ENetHost * host, ENetEvent * event) if (peer != NULL) { - peer -> address.host = host -> receivedAddress.host; - peer -> address.port = host -> receivedAddress.port; + memcpy(& peer -> address, & host -> receivedAddress, sizeof (host -> receivedAddress)); peer -> incomingDataTotal += host -> receivedDataLength; } diff --git a/unix.c b/unix.c index b3cadd0..cccdfeb 100644 --- a/unix.c +++ b/unix.c @@ -101,181 +101,120 @@ enet_time_set (enet_uint32 newTimeBase) timeBase = timeVal.tv_sec * 1000 + timeVal.tv_usec / 1000 - newTimeBase; } +int +enet_address_equal (ENetAddress * address1, ENetAddress * address2) +{ + if (address1 -> address.ss_family != address2 -> address.ss_family) + return 0; + + switch (address1 -> address.ss_family) + { + case AF_INET: + { + struct sockaddr_in *sin1, *sin2; + sin1 = (struct sockaddr_in *) & address1 -> address; + sin2 = (struct sockaddr_in *) & address2 -> address; + return sin1 -> sin_port == sin2 -> sin_port && + sin1 -> sin_addr.s_addr == sin2 -> sin_addr.s_addr; + } + case AF_INET6: + { + struct sockaddr_in6 *sin6a, *sin6b; + sin6a = (struct sockaddr_in6 *) & address1 -> address; + sin6b = (struct sockaddr_in6 *) & address2 -> address; + return sin6a -> sin6_port == sin6b -> sin6_port && + memcmp (& sin6a -> sin6_addr, & sin6b -> sin6_addr, sizeof (sin6a -> sin6_addr)) == sizeof(sin6a->sin6_addr); + } + default: + { + return 0; + } + } +} + +int +enet_address_set_port (ENetAddress * address, enet_uint16 port) +{ + if (address -> address.ss_family == AF_INET) + { + struct sockaddr_in *sin = (struct sockaddr_in *) &address -> address; + sin -> sin_port = ENET_HOST_TO_NET_16 (port); + return 0; + } + else if (address -> address.ss_family == AF_INET6) + { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) &address -> address; + sin6 -> sin6_port = ENET_HOST_TO_NET_16 (port); + return 0; + } + else + { + return -1; + } +} + int enet_address_set_host (ENetAddress * address, const char * name) { -#ifdef HAS_GETADDRINFO struct addrinfo hints, * resultList = NULL, * result = NULL; memset (& hints, 0, sizeof (hints)); - hints.ai_family = AF_INET; + hints.ai_family = AF_UNSPEC; + hints.ai_flags = AI_ADDRCONFIG; - if (getaddrinfo (name, NULL, NULL, & resultList) != 0) + if (getaddrinfo (name, NULL, & hints, & resultList) != 0) return -1; for (result = resultList; result != NULL; result = result -> ai_next) { - if (result -> ai_family == AF_INET && result -> ai_addr != NULL && result -> ai_addrlen >= sizeof (struct sockaddr_in)) - { - struct sockaddr_in * sin = (struct sockaddr_in *) result -> ai_addr; - - address -> host = sin -> sin_addr.s_addr; - - freeaddrinfo (resultList); - - return 0; - } + memcpy (& address -> address, result -> ai_addr, result -> ai_addrlen); + address -> addressLength = result -> ai_addrlen; + + freeaddrinfo (resultList); + + return 0; } if (resultList != NULL) freeaddrinfo (resultList); -#else - struct hostent * hostEntry = NULL; -#ifdef HAS_GETHOSTBYNAME_R - struct hostent hostData; - char buffer [2048]; - int errnum; -#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum); -#else - hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum); -#endif -#else - hostEntry = gethostbyname (name); -#endif - - if (hostEntry != NULL && hostEntry -> h_addrtype == AF_INET) - { - address -> host = * (enet_uint32 *) hostEntry -> h_addr_list [0]; - - return 0; - } -#endif - -#ifdef HAS_INET_PTON - if (! inet_pton (AF_INET, name, & address -> host)) -#else - if (! inet_aton (name, (struct in_addr *) & address -> host)) -#endif - return -1; - - return 0; -} - -int -enet_address_get_host_ip (const ENetAddress * address, char * name, size_t nameLength) -{ -#ifdef HAS_INET_NTOP - if (inet_ntop (AF_INET, & address -> host, name, nameLength) == NULL) -#else - char * addr = inet_ntoa (* (struct in_addr *) & address -> host); - if (addr != NULL) - { - size_t addrLen = strlen(addr); - if (addrLen >= nameLength) - return -1; - memcpy (name, addr, addrLen + 1); - } - else -#endif - return -1; - return 0; -} - -int -enet_address_get_host (const ENetAddress * address, char * name, size_t nameLength) -{ -#ifdef HAS_GETNAMEINFO - struct sockaddr_in sin; - int err; - - memset (& sin, 0, sizeof (struct sockaddr_in)); - - sin.sin_family = AF_INET; - sin.sin_port = ENET_HOST_TO_NET_16 (address -> port); - sin.sin_addr.s_addr = address -> host; - - err = getnameinfo ((struct sockaddr *) & sin, sizeof (sin), name, nameLength, NULL, 0, NI_NAMEREQD); - if (! err) - { - if (name != NULL && nameLength > 0 && ! memchr (name, '\0', nameLength)) - return -1; - return 0; - } - if (err != EAI_NONAME) - return -1; -#else - struct in_addr in; - struct hostent * hostEntry = NULL; -#ifdef HAS_GETHOSTBYADDR_R - struct hostent hostData; - char buffer [2048]; - int errnum; - - in.s_addr = address -> host; - -#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum); -#else - hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum); -#endif -#else - in.s_addr = address -> host; - - hostEntry = gethostbyaddr ((char *) & in, sizeof (struct in_addr), AF_INET); -#endif - - if (hostEntry != NULL) - { - size_t hostLen = strlen (hostEntry -> h_name); - if (hostLen >= nameLength) - return -1; - memcpy (name, hostEntry -> h_name, hostLen + 1); - return 0; - } -#endif - - return enet_address_get_host_ip (address, name, nameLength); + return -1; } int enet_socket_bind (ENetSocket socket, const ENetAddress * address) { - struct sockaddr_in sin; - - memset (& sin, 0, sizeof (struct sockaddr_in)); - - sin.sin_family = AF_INET; + struct sockaddr_in sinAny; + struct sockaddr *sin; + socklen_t sinLength; if (address != NULL) { - sin.sin_port = ENET_HOST_TO_NET_16 (address -> port); - sin.sin_addr.s_addr = address -> host; + sin = (struct sockaddr *) & address -> address; + sinLength = address -> addressLength; } else { - sin.sin_port = 0; - sin.sin_addr.s_addr = INADDR_ANY; + memset (& sinAny, 0, sizeof (struct sockaddr_in)); + sinAny.sin_family = AF_INET; + + sin = (struct sockaddr *) & sinAny; + sinLength = sizeof (sinAny); } return bind (socket, - (struct sockaddr *) & sin, - sizeof (struct sockaddr_in)); + sin, + sinLength); } int enet_socket_get_address (ENetSocket socket, ENetAddress * address) { - struct sockaddr_in sin; - socklen_t sinLength = sizeof (struct sockaddr_in); + address -> addressLength = sizeof (address -> address); - if (getsockname (socket, (struct sockaddr *) & sin, & sinLength) == -1) + if (getsockname (socket, (struct sockaddr *) & address -> address, & address -> addressLength) == -1) return -1; - address -> host = (enet_uint32) sin.sin_addr.s_addr; - address -> port = ENET_NET_TO_HOST_16 (sin.sin_port); - return 0; } @@ -305,10 +244,6 @@ enet_socket_set_option (ENetSocket socket, ENetSocketOption option, int value) #endif break; - case ENET_SOCKOPT_BROADCAST: - result = setsockopt (socket, SOL_SOCKET, SO_BROADCAST, (char *) & value, sizeof (int)); - break; - case ENET_SOCKOPT_REUSEADDR: result = setsockopt (socket, SOL_SOCKET, SO_REUSEADDR, (char *) & value, sizeof (int)); break; @@ -370,16 +305,9 @@ enet_socket_get_option (ENetSocket socket, ENetSocketOption option, int * value) int enet_socket_connect (ENetSocket socket, const ENetAddress * address) { - struct sockaddr_in sin; int result; - memset (& sin, 0, sizeof (struct sockaddr_in)); - - sin.sin_family = AF_INET; - sin.sin_port = ENET_HOST_TO_NET_16 (address -> port); - sin.sin_addr.s_addr = address -> host; - - result = connect (socket, (struct sockaddr *) & sin, sizeof (struct sockaddr_in)); + result = connect (socket, (struct sockaddr *) & address -> address, address -> addressLength); if (result == -1 && errno == EINPROGRESS) return 0; @@ -390,25 +318,20 @@ ENetSocket enet_socket_accept (ENetSocket socket, ENetAddress * address) { int result; - struct sockaddr_in sin; - socklen_t sinLength = sizeof (struct sockaddr_in); + + if (address != NULL) + address -> addressLength = sizeof (address -> address); result = accept (socket, - address != NULL ? (struct sockaddr *) & sin : NULL, - address != NULL ? & sinLength : NULL); + address != NULL ? (struct sockaddr *) & address -> address : NULL, + address != NULL ? & address -> addressLength : NULL); if (result == -1) return ENET_SOCKET_NULL; - if (address != NULL) - { - address -> host = (enet_uint32) sin.sin_addr.s_addr; - address -> port = ENET_NET_TO_HOST_16 (sin.sin_port); - } - return result; -} - +} + int enet_socket_shutdown (ENetSocket socket, ENetSocketShutdown how) { @@ -429,21 +352,14 @@ enet_socket_send (ENetSocket socket, size_t bufferCount) { struct msghdr msgHdr; - struct sockaddr_in sin; int sentLength; memset (& msgHdr, 0, sizeof (struct msghdr)); if (address != NULL) { - memset (& sin, 0, sizeof (struct sockaddr_in)); - - sin.sin_family = AF_INET; - sin.sin_port = ENET_HOST_TO_NET_16 (address -> port); - sin.sin_addr.s_addr = address -> host; - - msgHdr.msg_name = & sin; - msgHdr.msg_namelen = sizeof (struct sockaddr_in); + msgHdr.msg_name = & address -> address; + msgHdr.msg_namelen = address -> addressLength; } msgHdr.msg_iov = (struct iovec *) buffers; @@ -469,15 +385,14 @@ enet_socket_receive (ENetSocket socket, size_t bufferCount) { struct msghdr msgHdr; - struct sockaddr_in sin; int recvLength; memset (& msgHdr, 0, sizeof (struct msghdr)); if (address != NULL) { - msgHdr.msg_name = & sin; - msgHdr.msg_namelen = sizeof (struct sockaddr_in); + msgHdr.msg_name = & address -> address; + msgHdr.msg_namelen = sizeof (address -> address); } msgHdr.msg_iov = (struct iovec *) buffers; @@ -492,18 +407,15 @@ enet_socket_receive (ENetSocket socket, return -1; } + + if (address != NULL) + address -> addressLength = msgHdr.msg_namelen; #ifdef HAS_MSGHDR_FLAGS if (msgHdr.msg_flags & MSG_TRUNC) return -1; #endif - if (address != NULL) - { - address -> host = (enet_uint32) sin.sin_addr.s_addr; - address -> port = ENET_NET_TO_HOST_16 (sin.sin_port); - } - return recvLength; } diff --git a/win32.c b/win32.c index 5cc1679..94ea03d 100644 --- a/win32.c +++ b/win32.c @@ -14,14 +14,14 @@ static enet_uint32 timeBase = 0; int enet_initialize (void) { - WORD versionRequested = MAKEWORD (1, 1); + WORD versionRequested = MAKEWORD (2, 0); WSADATA wsaData; if (WSAStartup (versionRequested, & wsaData)) return -1; - if (LOBYTE (wsaData.wVersion) != 1|| - HIBYTE (wsaData.wVersion) != 1) + if (LOBYTE (wsaData.wVersion) != 2|| + HIBYTE (wsaData.wVersion) != 0) { WSACleanup (); @@ -59,102 +59,120 @@ enet_time_set (enet_uint32 newTimeBase) timeBase = (enet_uint32) timeGetTime () - newTimeBase; } +int +enet_address_set_port (ENetAddress * address, enet_uint16 port) +{ + if (address -> address.ss_family == AF_INET) + { + struct sockaddr_in *sin = (struct sockaddr_in *) &address -> address; + sin -> sin_port = ENET_HOST_TO_NET_16 (port); + return 0; + } + else if (address -> address.ss_family == AF_INET6) + { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) &address -> address; + sin6 -> sin6_port = ENET_HOST_TO_NET_16 (port); + return 0; + } + else + { + return -1; + } +} + +int +enet_address_equal (ENetAddress * address1, ENetAddress * address2) +{ + if (address1 -> address.ss_family != address2 -> address.ss_family) + return 0; + + switch (address1 -> address.ss_family) + { + case AF_INET: + { + struct sockaddr_in *sin1, *sin2; + sin1 = (struct sockaddr_in *) & address1 -> address; + sin2 = (struct sockaddr_in *) & address2 -> address; + return sin1 -> sin_port == sin2 -> sin_port && + sin1 -> sin_addr.S_un.S_addr == sin2 -> sin_addr.S_un.S_addr; + } + case AF_INET6: + { + struct sockaddr_in6 *sin6a, *sin6b; + sin6a = (struct sockaddr_in6 *) & address1 -> address; + sin6b = (struct sockaddr_in6 *) & address2 -> address; + return sin6a -> sin6_port == sin6b -> sin6_port && + memcmp (& sin6a -> sin6_addr, & sin6b -> sin6_addr, sizeof (sin6a -> sin6_addr)) == sizeof(sin6a->sin6_addr); + } + default: + { + return 0; + } + } +} + int enet_address_set_host (ENetAddress * address, const char * name) { - struct hostent * hostEntry; + struct addrinfo hints, * resultList = NULL, * result = NULL; - hostEntry = gethostbyname (name); - if (hostEntry == NULL || - hostEntry -> h_addrtype != AF_INET) + memset (& hints, 0, sizeof (hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_flags = AI_ADDRCONFIG; + + if (getaddrinfo (name, NULL, & hints, & resultList) != 0) + return -1; + + for (result = resultList; result != NULL; result = result -> ai_next) { - unsigned long host = inet_addr (name); - if (host == INADDR_NONE) - return -1; - address -> host = host; + memcpy (& address -> address, result -> ai_addr, result -> ai_addrlen); + address -> addressLength = result -> ai_addrlen; + + freeaddrinfo (resultList); + return 0; } - address -> host = * (enet_uint32 *) hostEntry -> h_addr_list [0]; + if (resultList != NULL) + freeaddrinfo (resultList); - return 0; -} - -int -enet_address_get_host_ip (const ENetAddress * address, char * name, size_t nameLength) -{ - char * addr = inet_ntoa (* (struct in_addr *) & address -> host); - if (addr == NULL) - return -1; - else - { - size_t addrLen = strlen(addr); - if (addrLen >= nameLength) - return -1; - memcpy (name, addr, addrLen + 1); - } - return 0; -} - -int -enet_address_get_host (const ENetAddress * address, char * name, size_t nameLength) -{ - struct in_addr in; - struct hostent * hostEntry; - - in.s_addr = address -> host; - - hostEntry = gethostbyaddr ((char *) & in, sizeof (struct in_addr), AF_INET); - if (hostEntry == NULL) - return enet_address_get_host_ip (address, name, nameLength); - else - { - size_t hostLen = strlen (hostEntry -> h_name); - if (hostLen >= nameLength) - return -1; - memcpy (name, hostEntry -> h_name, hostLen + 1); - } - - return 0; + return -1; } int enet_socket_bind (ENetSocket socket, const ENetAddress * address) { - struct sockaddr_in sin; - - memset (& sin, 0, sizeof (struct sockaddr_in)); - - sin.sin_family = AF_INET; + struct sockaddr_in sinAny; + struct sockaddr *sin; + socklen_t sinLength; if (address != NULL) { - sin.sin_port = ENET_HOST_TO_NET_16 (address -> port); - sin.sin_addr.s_addr = address -> host; + sin = (struct sockaddr *) & address -> address; + sinLength = address -> addressLength; } else { - sin.sin_port = 0; - sin.sin_addr.s_addr = INADDR_ANY; + memset (& sinAny, 0, sizeof (struct sockaddr_in)); + sinAny.sin_family = AF_INET; + + sin = (struct sockaddr *) & sinAny; + sinLength = sizeof (sinAny); } return bind (socket, - (struct sockaddr *) & sin, - sizeof (struct sockaddr_in)) == SOCKET_ERROR ? -1 : 0; + sin, + sinLength); } int enet_socket_get_address (ENetSocket socket, ENetAddress * address) { - struct sockaddr_in sin; - int sinLength = sizeof (struct sockaddr_in); + address -> addressLength = sizeof (address -> address); - if (getsockname (socket, (struct sockaddr *) & sin, & sinLength) == -1) + if (getsockname (socket, (struct sockaddr *) & address -> address, & address -> addressLength) == -1) return -1; - address -> host = (enet_uint32) sin.sin_addr.s_addr; - address -> port = ENET_NET_TO_HOST_16 (sin.sin_port); - return 0; } @@ -183,10 +201,6 @@ enet_socket_set_option (ENetSocket socket, ENetSocketOption option, int value) break; } - case ENET_SOCKOPT_BROADCAST: - result = setsockopt (socket, SOL_SOCKET, SO_BROADCAST, (char *) & value, sizeof (int)); - break; - case ENET_SOCKOPT_REUSEADDR: result = setsockopt (socket, SOL_SOCKET, SO_REUSEADDR, (char *) & value, sizeof (int)); break; @@ -237,16 +251,9 @@ enet_socket_get_option (ENetSocket socket, ENetSocketOption option, int * value) int enet_socket_connect (ENetSocket socket, const ENetAddress * address) { - struct sockaddr_in sin; int result; - memset (& sin, 0, sizeof (struct sockaddr_in)); - - sin.sin_family = AF_INET; - sin.sin_port = ENET_HOST_TO_NET_16 (address -> port); - sin.sin_addr.s_addr = address -> host; - - result = connect (socket, (struct sockaddr *) & sin, sizeof (struct sockaddr_in)); + result = connect (socket, (struct sockaddr *) & address -> address, address -> addressLength); if (result == SOCKET_ERROR && WSAGetLastError () != WSAEWOULDBLOCK) return -1; @@ -256,22 +263,17 @@ enet_socket_connect (ENetSocket socket, const ENetAddress * address) ENetSocket enet_socket_accept (ENetSocket socket, ENetAddress * address) { - SOCKET result; - struct sockaddr_in sin; - int sinLength = sizeof (struct sockaddr_in); - - result = accept (socket, - address != NULL ? (struct sockaddr *) & sin : NULL, - address != NULL ? & sinLength : NULL); - - if (result == INVALID_SOCKET) - return ENET_SOCKET_NULL; + int result; if (address != NULL) - { - address -> host = (enet_uint32) sin.sin_addr.s_addr; - address -> port = ENET_NET_TO_HOST_16 (sin.sin_port); - } + address -> addressLength = sizeof (address -> address); + + result = accept (socket, + address != NULL ? (struct sockaddr *) & address -> address : NULL, + address != NULL ? & address -> addressLength : NULL); + + if (result == -1) + return ENET_SOCKET_NULL; return result; } @@ -295,25 +297,15 @@ enet_socket_send (ENetSocket socket, const ENetBuffer * buffers, size_t bufferCount) { - struct sockaddr_in sin; DWORD sentLength; - if (address != NULL) - { - memset (& sin, 0, sizeof (struct sockaddr_in)); - - sin.sin_family = AF_INET; - sin.sin_port = ENET_HOST_TO_NET_16 (address -> port); - sin.sin_addr.s_addr = address -> host; - } - if (WSASendTo (socket, (LPWSABUF) buffers, (DWORD) bufferCount, & sentLength, 0, - address != NULL ? (struct sockaddr *) & sin : NULL, - address != NULL ? sizeof (struct sockaddr_in) : 0, + address != NULL ? (struct sockaddr *) & address -> address : NULL, + address != NULL ? address -> addressLength : 0, NULL, NULL) == SOCKET_ERROR) { @@ -332,18 +324,19 @@ enet_socket_receive (ENetSocket socket, ENetBuffer * buffers, size_t bufferCount) { - INT sinLength = sizeof (struct sockaddr_in); DWORD flags = 0, recvLength; - struct sockaddr_in sin; + + if (address != NULL) + address -> addressLength = sizeof (address -> address); if (WSARecvFrom (socket, (LPWSABUF) buffers, (DWORD) bufferCount, & recvLength, & flags, - address != NULL ? (struct sockaddr *) & sin : NULL, - address != NULL ? & sinLength : NULL, + address != NULL ? (struct sockaddr *) & address -> address : NULL, + address != NULL ? & address -> addressLength : NULL, NULL, NULL) == SOCKET_ERROR) { @@ -360,12 +353,6 @@ enet_socket_receive (ENetSocket socket, if (flags & MSG_PARTIAL) return -1; - if (address != NULL) - { - address -> host = (enet_uint32) sin.sin_addr.s_addr; - address -> port = ENET_NET_TO_HOST_16 (sin.sin_port); - } - return (int) recvLength; }