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 here. -The last release that is protocol compatible with the 1.2 series or earlier (1.2.4) can be downloaded here +The most recent stable release (1.3.3) can be downloaded here. +The last release that is protocol compatible with the 1.2 series or earlier (1.2.5) can be downloaded here 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 448d09f2..6db3fca8 100644 Binary files a/source/lib/enet.lib and b/source/lib/enet.lib differ