99 lines
3.5 KiB
Diff
99 lines
3.5 KiB
Diff
diff --git a/thirdparty/enet/enet/enet.h b/thirdparty/enet/enet/enet.h
|
|
index 54d91b5603..24d36647d9 100644
|
|
--- a/thirdparty/enet/enet/enet.h
|
|
+++ b/thirdparty/enet/enet/enet.h
|
|
@@ -10,13 +10,19 @@ extern "C"
|
|
{
|
|
#endif
|
|
|
|
+#include <stdint.h>
|
|
#include <stdlib.h>
|
|
|
|
+// -- Godot start --
|
|
+#if 0
|
|
#ifdef _WIN32
|
|
#include "enet/win32.h"
|
|
#else
|
|
#include "enet/unix.h"
|
|
#endif
|
|
+#endif
|
|
+#include "enet/godot.h"
|
|
+// -- Godot end --
|
|
|
|
#include "enet/types.h"
|
|
#include "enet/protocol.h"
|
|
@@ -86,11 +92,15 @@ typedef enum _ENetSocketShutdown
|
|
* 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.
|
|
*/
|
|
+// -- Godot start --
|
|
+#if 0
|
|
typedef struct _ENetAddress
|
|
{
|
|
enet_uint32 host;
|
|
enet_uint16 port;
|
|
} ENetAddress;
|
|
+#endif
|
|
+// -- Godot end --
|
|
|
|
/**
|
|
* Packet flag bit constants.
|
|
@@ -606,6 +616,10 @@ ENET_API size_t enet_range_coder_decompress (void *, const enet_uint8 *, size_t,
|
|
|
|
extern size_t enet_protocol_command_size (enet_uint8);
|
|
|
|
+// -- Godot start --
|
|
+#include "enet/godot_ext.h"
|
|
+// -- Godot end --
|
|
+
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
diff --git a/thirdparty/enet/host.c b/thirdparty/enet/host.c
|
|
index 3be6c0922c..fc4da4ca67 100644
|
|
--- a/thirdparty/enet/host.c
|
|
+++ b/thirdparty/enet/host.c
|
|
@@ -87,7 +87,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;
|
|
+ memset(host -> receivedAddress.host, 0, 16);
|
|
host -> receivedAddress.port = 0;
|
|
host -> receivedData = NULL;
|
|
host -> receivedDataLength = 0;
|
|
diff --git a/thirdparty/enet/protocol.c b/thirdparty/enet/protocol.c
|
|
index 0a60253173..fefc0e6f0a 100644
|
|
--- a/thirdparty/enet/protocol.c
|
|
+++ b/thirdparty/enet/protocol.c
|
|
@@ -307,7 +307,7 @@ enet_protocol_handle_connect (ENetHost * host, ENetProtocolHeader * header, ENet
|
|
}
|
|
else
|
|
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 &&
|
|
currentPeer -> connectID == command -> connect.connectID)
|
|
@@ -1027,9 +1027,8 @@ 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_host_equal(host -> receivedAddress.host, peer -> address.host) ||
|
|
+ host -> receivedAddress.port != peer -> address.port) ||
|
|
(peer -> outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID &&
|
|
sessionID != peer -> incomingSessionID))
|
|
return 0;
|
|
@@ -1071,7 +1070,7 @@ enet_protocol_handle_incoming_commands (ENetHost * host, ENetEvent * event)
|
|
|
|
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 -> incomingDataTotal += host -> receivedDataLength;
|
|
}
|