asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert ENetAddress host to 16 bytes to accomote IPv6

Browse source
This commit is contained in:
Fabio Alessandrelli 2017-01-22 05:53:08 +01:00
parent 4cc1b04586
commit 5bdbc0f762
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
thirdparty/enet/enet/enet.h vendored
View file

@ -12,11 +12,7 @@ extern "C"
#include <stdlib.h> #include <stdlib.h>
#ifdef _WIN32 #include "enet/godot.h"
#include "enet/win32.h"
#else
#include "enet/unix.h"
#endif
#include "enet/types.h" #include "enet/types.h"
#include "enet/protocol.h" #include "enet/protocol.h"
@ -72,7 +68,6 @@ typedef enum _ENetSocketShutdown
ENET_SOCKET_SHUTDOWN_READ_WRITE = 2 ENET_SOCKET_SHUTDOWN_READ_WRITE = 2
} ENetSocketShutdown; } ENetSocketShutdown;
#define ENET_HOST_ANY 0
#define ENET_HOST_BROADCAST 0xFFFFFFFFU #define ENET_HOST_BROADCAST 0xFFFFFFFFU
#define ENET_PORT_ANY 0 #define ENET_PORT_ANY 0
@ -88,9 +83,11 @@ typedef enum _ENetSocketShutdown
*/ */
typedef struct _ENetAddress typedef struct _ENetAddress
{ {
enet_uint32 host; uint8_t host[16];
enet_uint16 port; enet_uint16 port;
uint8_t wildcard;
} ENetAddress; } ENetAddress;
#define enet_host_equal(host_a, host_b) (memcmp(&host_a, &host_b,16) == 0)
/** /**
* Packet flag bit constants. * Packet flag bit constants.
@ -519,6 +516,16 @@ ENET_API int enet_socketset_select (ENetSocket, ENetSocketSet *, ENetSock
*/ */
ENET_API int enet_address_set_host (ENetAddress * address, const char * hostName); ENET_API int enet_address_set_host (ENetAddress * address, const char * hostName);
/** Sets the host field in the address parameter from ip struct.
@param address destination to store resolved address
@param ip the ip struct to read from
@param size the size of the ip struct.
@retval 0 on success
@retval != 0 on failure
@returns the address of the given ip in address on success.
*/
ENET_API void enet_address_set_ip(ENetAddress * address, const uint8_t * ip, size_t size);
/** Gives the printable form of the IP address specified in the address parameter. /** Gives the printable form of the IP address specified in the address parameter.
@param address address printed @param address address printed
@param hostName destination for name, must not be NULL @param hostName destination for name, must not be NULL

2
thirdparty/enet/host.c vendored
View file

@ -87,7 +87,7 @@ enet_host_create (const ENetAddress * address, size_t peerCount, size_t channelL
host -> commandCount = 0; host -> commandCount = 0;
host -> bufferCount = 0; host -> bufferCount = 0;
host -> checksum = NULL; host -> checksum = NULL;
host -> receivedAddress.host = ENET_HOST_ANY; memset(host -> receivedAddress.host, 0, 16);
host -> receivedAddress.port = 0; host -> receivedAddress.port = 0;
host -> receivedData = NULL; host -> receivedData = NULL;
host -> receivedDataLength = 0; host -> receivedDataLength = 0;

9
thirdparty/enet/protocol.c vendored
View file

@ -299,7 +299,7 @@ enet_protocol_handle_connect (ENetHost * host, ENetProtocolHeader * header, ENet
} }
else else
if (currentPeer -> state != ENET_PEER_STATE_CONNECTING && if (currentPeer -> state != ENET_PEER_STATE_CONNECTING &&
currentPeer -> address.host == host -> receivedAddress.host) enet_host_equal(currentPeer -> address.host, host -> receivedAddress.host))
{ {
if (currentPeer -> address.port == host -> receivedAddress.port && if (currentPeer -> address.port == host -> receivedAddress.port &&
currentPeer -> connectID == command -> connect.connectID) currentPeer -> connectID == command -> connect.connectID)
@ -1011,9 +1011,8 @@ enet_protocol_handle_incoming_commands (ENetHost * host, ENetEvent * event)
if (peer -> state == ENET_PEER_STATE_DISCONNECTED || if (peer -> state == ENET_PEER_STATE_DISCONNECTED ||
peer -> state == ENET_PEER_STATE_ZOMBIE || peer -> state == ENET_PEER_STATE_ZOMBIE ||
((host -> receivedAddress.host != peer -> address.host || (!enet_host_equal(host -> receivedAddress.host, peer -> address.host) ||
host -> receivedAddress.port != peer -> address.port) && host -> receivedAddress.port != peer -> address.port) ||
peer -> address.host != ENET_HOST_BROADCAST) ||
(peer -> outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID && (peer -> outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID &&
sessionID != peer -> incomingSessionID)) sessionID != peer -> incomingSessionID))
return 0; return 0;
@ -1055,7 +1054,7 @@ enet_protocol_handle_incoming_commands (ENetHost * host, ENetEvent * event)
if (peer != NULL) if (peer != NULL)
{ {
peer -> address.host = host -> receivedAddress.host; enet_address_set_ip(&(peer -> address), host -> receivedAddress.host, 16);
peer -> address.port = host -> receivedAddress.port; peer -> address.port = host -> receivedAddress.port;
peer -> incomingDataTotal += host -> receivedDataLength; peer -> incomingDataTotal += host -> receivedDataLength;
} }