From 46c981df544b2fc0a7d840b05b098ac95888d189 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Mon, 30 May 2011 19:34:02 +0000 Subject: [PATCH] enet checks git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6483 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/enet/protocol.c | 3 ++- source/lib/enet.lib | Bin 44896 -> 45262 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/enet/protocol.c b/source/enet/protocol.c index 2237ba84..9791839d 100755 --- a/source/enet/protocol.c +++ b/source/enet/protocol.c @@ -852,7 +852,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.host != peer -> address.host || + host -> receivedAddress.port != peer -> address.port) && peer -> address.host != ENET_HOST_BROADCAST) || (peer -> outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID && sessionID != peer -> incomingSessionID)) diff --git a/source/lib/enet.lib b/source/lib/enet.lib index 27877ab34d972b6df4c1eaebd376b5ccc78538b6..c10ec1b6b5a514d2f870a10bfb071cf8a6b1c1ba 100644 GIT binary patch delta 9405 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 delta 9056 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