From 33f3a5fa9f9676c9ec5e021dee79adfd12db1ecb Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Tue, 28 Jun 2011 16:15:36 +0000
Subject: [PATCH] enet 1.3.3

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6547 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/enet/ChangeLog           |   8 ++++++++
 source/enet/Makefile.am         |   2 +-
 source/enet/Makefile.in         |   2 +-
 source/enet/configure           |  20 ++++++++++----------
 source/enet/configure.ac        |   2 +-
 source/enet/docs/mainpage.dox   |   4 ++--
 source/enet/include/enet/enet.h |   2 +-
 source/enet/protocol.c          |   2 +-
 source/lib/enet.lib             | Bin 46312 -> 46296 bytes
 9 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/source/enet/ChangeLog b/source/enet/ChangeLog
index 47c38adc..861d51f5 100644
--- a/source/enet/ChangeLog
+++ b/source/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/source/enet/Makefile.am b/source/enet/Makefile.am
index da792bce..d01006ea 100755
--- a/source/enet/Makefile.am
+++ b/source/enet/Makefile.am
@@ -16,7 +16,7 @@ enetinclude_HEADERS = \
 lib_LTLIBRARIES = libenet.la
 libenet_la_SOURCES = callbacks.c compress.c host.c list.c packet.c peer.c protocol.c unix.c win32.c
 # see info '(libtool) Updating version info' before making a release
-libenet_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:2:0
+libenet_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:3:0
 INCLUDES = -Iinclude
 
 ACLOCAL_AMFLAGS = -Im4
diff --git a/source/enet/Makefile.in b/source/enet/Makefile.in
index 64cfc9a6..b2505529 100755
--- a/source/enet/Makefile.in
+++ b/source/enet/Makefile.in
@@ -243,7 +243,7 @@ enetinclude_HEADERS = \
 lib_LTLIBRARIES = libenet.la
 libenet_la_SOURCES = callbacks.c compress.c host.c list.c packet.c peer.c protocol.c unix.c win32.c
 # see info '(libtool) Updating version info' before making a release
-libenet_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0
+libenet_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:3:0
 INCLUDES = -Iinclude
 ACLOCAL_AMFLAGS = -Im4
 all: all-am
diff --git a/source/enet/configure b/source/enet/configure
index 34bd1eb3..87e2ee98 100755
--- a/source/enet/configure
+++ b/source/enet/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libenet 1.3.2.
+# Generated by GNU Autoconf 2.67 for libenet 1.3.3.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libenet'
 PACKAGE_TARNAME='libenet'
-PACKAGE_VERSION='1.3.2'
-PACKAGE_STRING='libenet 1.3.2'
+PACKAGE_VERSION='1.3.3'
+PACKAGE_STRING='libenet 1.3.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libenet 1.3.2 to adapt to many kinds of systems.
+\`configure' configures libenet 1.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1485,7 +1485,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libenet 1.3.2:";;
+     short | recursive ) echo "Configuration of libenet 1.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1586,7 +1586,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libenet configure 1.3.2
+libenet configure 1.3.3
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1975,7 +1975,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libenet $as_me 1.3.2, which was
+It was created by libenet $as_me 1.3.3, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2791,7 +2791,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libenet'
- VERSION='1.3.2'
+ VERSION='1.3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11108,7 +11108,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libenet $as_me 1.3.2, which was
+This file was extended by libenet $as_me 1.3.3, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11165,7 +11165,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libenet config.status 1.3.2
+libenet config.status 1.3.3
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/enet/configure.ac b/source/enet/configure.ac
index 3486ca80..c9928230 100644
--- a/source/enet/configure.ac
+++ b/source/enet/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libenet], [1.3.2])
+AC_INIT([libenet], [1.3.3])
 AC_CONFIG_SRCDIR([include/enet/enet.h])
 AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE([enable])
diff --git a/source/enet/docs/mainpage.dox b/source/enet/docs/mainpage.dox
index 3b6234a4..a4626183 100755
--- a/source/enet/docs/mainpage.dox
+++ b/source/enet/docs/mainpage.dox
@@ -36,8 +36,8 @@ portable, and easily embeddable.
 You can retrieve the source to ENet by downloading it in either .tar.gz form
 or accessing the cvs distribution directly.
 
-The most recent stable release (1.3.2) can be downloaded <a href="http://enet.bespin.org/download/enet-1.3.2.tar.gz">here</a>. 
-The last release that is protocol compatible with the 1.2 series or earlier (1.2.4) can be downloaded <a href="http://enet.bespin.org/download/enet-1.2.4.tar.gz">here</a> 
+The most recent stable release (1.3.3) can be downloaded <a href="http://enet.bespin.org/download/enet-1.3.3.tar.gz">here</a>. 
+The last release that is protocol compatible with the 1.2 series or earlier (1.2.5) can be downloaded <a href="http://enet.bespin.org/download/enet-1.2.5.tar.gz">here</a> 
 
 To access ENet via anonymous CVS, you must use the CVSROOT
 :pserver:anonymous\@bespin.org:/var/lib/cvs/enet with an empty
diff --git a/source/enet/include/enet/enet.h b/source/enet/include/enet/enet.h
index 02dc2c0a..716635be 100755
--- a/source/enet/include/enet/enet.h
+++ b/source/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/source/enet/protocol.c b/source/enet/protocol.c
index d7c3fede..da64e915 100755
--- a/source/enet/protocol.c
+++ b/source/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)
diff --git a/source/lib/enet.lib b/source/lib/enet.lib
index 448d09f2c641bf0f061134db2899ebe7b0ee6342..6db3fca8d8329cad454119b7e0c59ac089d6b593 100644
GIT binary patch
delta 2743
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

delta 2826
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
OTl(3z=o?3B-Twu;0Ygy$