summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-14 22:46:13 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-14 22:47:45 +0100
commitdffeb1fa216e67edf52590c59dd44cfc6958e087 (patch)
treef517e742ef307bee2d2081638ecec63914c23607 /libs
parent30c80aa7b9f41f6ab3892ddfbb2d442051ed98a4 (diff)
downloadmanaserv-dffeb1fa216e67edf52590c59dd44cfc6958e087.tar.gz
manaserv-dffeb1fa216e67edf52590c59dd44cfc6958e087.tar.xz
manaserv-dffeb1fa216e67edf52590c59dd44cfc6958e087.zip
Updated enet to 1.3.3
The bugfix is not likely to affect us, but better to be up to date anyway.
Diffstat (limited to 'libs')
-rw-r--r--libs/enet/ChangeLog8
-rw-r--r--libs/enet/include/enet/enet.h2
-rw-r--r--libs/enet/protocol.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/libs/enet/ChangeLog b/libs/enet/ChangeLog
index 47c38ad..861d51f 100644
--- a/libs/enet/ChangeLog
+++ b/libs/enet/ChangeLog
@@ -1,3 +1,7 @@
+ENet 1.3.3 (June 28, 2011):
+
+* fixed bug with simultaneous disconnects not dispatching events
+
ENet 1.3.2 (May 31, 2011):
* added support for unreliable packet fragmenting via the packet flag
@@ -28,6 +32,10 @@ Caveats: This version is not protocol compatible with the 1.2 series or
earlier. The enet_host_connect and enet_host_create API functions require
supplying additional parameters.
+ENet 1.2.5 (June 28, 2011):
+
+* fixed bug with simultaneous disconnects not dispatching events
+
ENet 1.2.4 (May 31, 2011):
* fixed regression in unreliable packet queuing
diff --git a/libs/enet/include/enet/enet.h b/libs/enet/include/enet/enet.h
index 02dc2c0..716635b 100644
--- a/libs/enet/include/enet/enet.h
+++ b/libs/enet/include/enet/enet.h
@@ -25,7 +25,7 @@ extern "C"
#define ENET_VERSION_MAJOR 1
#define ENET_VERSION_MINOR 3
-#define ENET_VERSION_PATCH 2
+#define ENET_VERSION_PATCH 3
#define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)<<8) | (patch))
#define ENET_VERSION ENET_VERSION_CREATE(ENET_VERSION_MAJOR, ENET_VERSION_MINOR, ENET_VERSION_PATCH)
diff --git a/libs/enet/protocol.c b/libs/enet/protocol.c
index d7c3fed..da64e91 100644
--- a/libs/enet/protocol.c
+++ b/libs/enet/protocol.c
@@ -764,7 +764,7 @@ enet_protocol_handle_disconnect (ENetHost * host, ENetPeer * peer, const ENetPro
enet_peer_reset_queues (peer);
- if (peer -> state == ENET_PEER_STATE_CONNECTION_SUCCEEDED)
+ if (peer -> state == ENET_PEER_STATE_CONNECTION_SUCCEEDED || peer -> state == ENET_PEER_STATE_DISCONNECTING)
enet_protocol_dispatch_state (host, peer, ENET_PEER_STATE_ZOMBIE);
else
if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)