tizen 2.3.1 release accepted/tizen_2.4_mobile tizen_2.3.1 tizen_2.4 accepted/tizen/2.4/mobile/20151029.035728 submit/tizen_2.3.1/20150915.075025 submit/tizen_2.4/20151028.063221 tizen_2.3.1_release tizen_2.4_mobile_release
authorjk7744.park <jk7744.park@samsung.com>
Tue, 8 Sep 2015 13:00:55 +0000 (22:00 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Tue, 8 Sep 2015 13:00:55 +0000 (22:00 +0900)
106 files changed:
.gbs.conf [new file with mode: 0644]
.gitignore [new file with mode: 0644]
CMakeLists.txt [new file with mode: 0644]
INSTALL [new file with mode: 0644]
LICENSE [new file with mode: 0644]
Makefile.am [new file with mode: 0644]
README [new file with mode: 0644]
README.build [new file with mode: 0644]
README.coding [new file with mode: 0644]
README.test-apps [new file with mode: 0644]
autogen.sh [new file with mode: 0755]
changelog [new file with mode: 0644]
cmake/FindGit.cmake [new file with mode: 0755]
cmake/FindOpenSSLbins.cmake [new file with mode: 0644]
config.h.cmake [new file with mode: 0644]
configure.ac [new file with mode: 0644]
lib/.gitignore [new file with mode: 0644]
lib/Makefile.am [new file with mode: 0644]
lib/base64-decode.c [new file with mode: 0644]
lib/client-handshake.c [new file with mode: 0644]
lib/client-parser.c [new file with mode: 0644]
lib/client.c [new file with mode: 0644]
lib/daemonize.c [new file with mode: 0644]
lib/extension-deflate-frame.c [new file with mode: 0644]
lib/extension-deflate-frame.h [new file with mode: 0644]
lib/extension-deflate-stream.c [new file with mode: 0644]
lib/extension-deflate-stream.h [new file with mode: 0644]
lib/extension.c [new file with mode: 0644]
lib/getifaddrs.c [new file with mode: 0644]
lib/getifaddrs.h [new file with mode: 0644]
lib/handshake.c [new file with mode: 0644]
lib/libwebsockets.c [new file with mode: 0644]
lib/libwebsockets.h [new file with mode: 0644]
lib/minilex.c [new file with mode: 0644]
lib/output.c [new file with mode: 0644]
lib/parsers.c [new file with mode: 0644]
lib/private-libwebsockets.h [new file with mode: 0644]
lib/server-handshake.c [new file with mode: 0644]
lib/server.c [new file with mode: 0644]
lib/sha-1.c [new file with mode: 0644]
libwebsockets-api-doc.html [new file with mode: 0644]
libwebsockets.manifest [new file with mode: 0644]
libwebsockets.pc.in [new file with mode: 0644]
libwebsockets.spec [new file with mode: 0644]
m4/ignore-me [new file with mode: 0644]
packaging/libwebsockets.changes [new file with mode: 0644]
packaging/libwebsockets.spec [new file with mode: 0644]
scripts/kernel-doc [new file with mode: 0755]
test-server/.gitignore [new file with mode: 0644]
test-server/Makefile.am [new file with mode: 0644]
test-server/attack.sh [new file with mode: 0755]
test-server/favicon.ico [new file with mode: 0644]
test-server/leaf.jpg [new file with mode: 0644]
test-server/libwebsockets.org-logo.png [new file with mode: 0644]
test-server/test-client.c [new file with mode: 0644]
test-server/test-echo.c [new file with mode: 0644]
test-server/test-fraggle.c [new file with mode: 0644]
test-server/test-ping.c [new file with mode: 0644]
test-server/test-server.c [new file with mode: 0644]
test-server/test.html [new file with mode: 0644]
win32port/client/client.vcxproj [new file with mode: 0644]
win32port/client/client.vcxproj.filters [new file with mode: 0644]
win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters [new file with mode: 0644]
win32port/server/server.vcxproj [new file with mode: 0644]
win32port/server/server.vcxproj.filters [new file with mode: 0644]
win32port/win32helpers/getopt.c [new file with mode: 0644]
win32port/win32helpers/getopt.h [new file with mode: 0644]
win32port/win32helpers/getopt_long.c [new file with mode: 0644]
win32port/win32helpers/gettimeofday.c [new file with mode: 0644]
win32port/win32helpers/gettimeofday.h [new file with mode: 0644]
win32port/win32helpers/netdb.h [new file with mode: 0644]
win32port/win32helpers/strings.h [new file with mode: 0644]
win32port/win32helpers/sys/time.h [new file with mode: 0644]
win32port/win32helpers/unistd.h [new file with mode: 0644]
win32port/win32helpers/websock-w32.c [new file with mode: 0644]
win32port/win32helpers/websock-w32.h [new file with mode: 0644]
win32port/win32port.sln [new file with mode: 0644]
win32port/zlib/ZLib.vcxproj [new file with mode: 0644]
win32port/zlib/ZLib.vcxproj.filters [new file with mode: 0644]
win32port/zlib/adler32.c [new file with mode: 0644]
win32port/zlib/compress.c [new file with mode: 0644]
win32port/zlib/crc32.c [new file with mode: 0644]
win32port/zlib/crc32.h [new file with mode: 0644]
win32port/zlib/deflate.c [new file with mode: 0644]
win32port/zlib/deflate.h [new file with mode: 0644]
win32port/zlib/gzclose.c [new file with mode: 0755]
win32port/zlib/gzguts.h [new file with mode: 0755]
win32port/zlib/gzio.c [new file with mode: 0644]
win32port/zlib/gzlib.c [new file with mode: 0755]
win32port/zlib/gzread.c [new file with mode: 0755]
win32port/zlib/gzwrite.c [new file with mode: 0755]
win32port/zlib/infback.c [new file with mode: 0644]
win32port/zlib/inffast.c [new file with mode: 0644]
win32port/zlib/inffast.h [new file with mode: 0644]
win32port/zlib/inffixed.h [new file with mode: 0644]
win32port/zlib/inflate.c [new file with mode: 0644]
win32port/zlib/inflate.h [new file with mode: 0644]
win32port/zlib/inftrees.c [new file with mode: 0644]
win32port/zlib/inftrees.h [new file with mode: 0644]
win32port/zlib/trees.c [new file with mode: 0644]
win32port/zlib/trees.h [new file with mode: 0644]
win32port/zlib/uncompr.c [new file with mode: 0644]
win32port/zlib/zconf.h [new file with mode: 0644]
win32port/zlib/zlib.h [new file with mode: 0644]
win32port/zlib/zutil.c [new file with mode: 0644]
win32port/zlib/zutil.h [new file with mode: 0644]

diff --git a/.gbs.conf b/.gbs.conf
new file mode 100644 (file)
index 0000000..fa9fdc5
--- /dev/null
+++ b/.gbs.conf
@@ -0,0 +1,3 @@
+[general]
+upstream_branch = upstream
+upstream_tag = ${upstreamversion}
diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..fe97715
--- /dev/null
@@ -0,0 +1,39 @@
+#Ignore build files
+Makefile
+config.h
+config.log
+config.status
+libtool
+stamp-h1
+output/
+win32port/ipch/
+win32port/Debug*/
+win32port/Release*/
+win32port/server/Debug*/
+win32port/server/Release*/
+win32port/client/Debug*/
+win32port/client/Release*/
+win32port/libwebsocketswin32/Debug*/
+win32port/libwebsocketswin32/Release*/
+win32port/zlib/Debug*/
+win32port/zlib/Release*/
+*.vcxproj.user
+*.opensdf
+*.sdf
+*.suo
+*.su
+*.m4
+missing
+depcomp
+install-sh
+configure
+compile
+config.guess
+*.in
+*~
+*.orig
+autom4te.cache/
+ltmain.sh
+config.sub
+ar-lib
+libwebsockets.pc
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 (file)
index 0000000..be5c17e
--- /dev/null
@@ -0,0 +1,747 @@
+cmake_minimum_required(VERSION 2.6)
+
+project(libwebsockets)
+
+set(PACKAGE "libwebsockets")
+set(CPACK_PACKAGE_NAME "${PACKAGE}")
+set(CPACK_PACKAGE_VERSION_MAJOR "1")
+set(CPACK_PACKAGE_VERSION_MINOR "2")
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+set(CPACK_PACKAGE_VENDOR "andy@warmcat.com")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
+set(SOVERSION "3.0.0")
+set(CPACK_SOURCE_GENERATOR "TGZ")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+set(VERSION "${CPACK_PACKAGE_VERSION}")
+
+set(LWS_LIBRARY_VERSION ${CPACK_PACKAGE_VERSION})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
+
+# Try to find the current Git hash.
+find_package(Git)
+if(GIT_EXECUTABLE)
+       execute_process(
+    COMMAND "${GIT_EXECUTABLE}" log -n 1 --pretty=%h
+    OUTPUT_VARIABLE GIT_HASH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    set(LWS_BUILD_HASH ${GIT_HASH})
+    message("Git commit hash: ${LWS_BUILD_HASH}")
+endif()
+
+option(WITH_SSL "Include SSL support (default OpenSSL, CyaSSL if USE_CYASSL is set)" ON)
+option(USE_EXTERNAL_ZLIB "Search the system for ZLib instead of using the included one (on Windows)" OFF)
+option(USE_CYASSL "Use CyaSSL replacement for OpenSSL. When settings this, you also need to specify CYASSL_LIB and CYASSL_INCLUDE_DIRS" OFF)
+option(WITHOUT_BUILTIN_GETIFADDRS "Don't use BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... Default is your libc provides it. On some systems such as uclibc it doesn't exist." OFF)
+option(WITHOUT_CLIENT "Don't build the client part of the library" OFF)
+option(WITHOUT_SERVER "Don't build the server part of the library" OFF)
+#option(WITH_LIBCRYPTO "Use libcrypto MD5 and SHA1 implementations" ON)
+option(LINK_TESTAPPS_DYNAMIC "Link the test apps to the shared version of the library. Default is to link statically" OFF)
+option(WITHOUT_TESTAPPS "Don't build the libwebsocket-test-apps" OFF)
+option(WITHOUT_TEST_SERVER "Don't build the test server" OFF)
+option(WITHOUT_TEST_SERVER_EXTPOLL "Don't build the test server version that uses external poll" OFF)
+option(WITHOUT_TEST_PING "Don't build the ping test application" OFF)
+option(WITHOUT_TEST_CLIENT "Don't build the client test application" OFF)
+option(WITHOUT_TEST_FRAGGLE "Don't build the ping test application" OFF)
+option(WITHOUT_DEBUG "Don't compile debug related code" OFF)
+option(WITHOUT_EXTENSIONS "Don't compile with extensions" OFF)
+option(WITH_LATENCY "Build latency measuring code into the library" OFF)
+option(WITHOUT_DAEMONIZE "Don't build the daemonization api" OFF)
+option(WITH_SD_DAEMON "Build support for systemd based socket activation" OFF)
+
+if (WITHOUT_CLIENT AND WITHOUT_SERVER)
+       message(FATAL_ERROR "Makes no sense to compile without both client or server.")
+endif()
+
+# The base dir where the test-apps look for the SSL certs.
+set(SSL_CERT_DIR CACHE STRING "")
+set(SSL_CLIENT_CERT_DIR CACHE STRING "")
+
+if ("${SSL_CERT_DIR}" STREQUAL "")
+       set(SSL_CERT_DIR "../share")
+endif()
+
+if ("${SSL_CLIENT_CERT_DIR}" STREQUAL "")
+       if (WIN32)
+               set(LWS_OPENSSL_CLIENT_CERTS ".")
+       else()
+               set(LWS_OPENSSL_CLIENT_CERTS "/etc/pki/tls/certs/")
+       endif()
+else()
+       set(LWS_OPENSSL_CLIENT_CERTS "${SSL_CLIENT_CERT_DIR}")
+endif()
+
+set(CYASSL_LIB CACHE STRING "")
+set(CYASSL_INCLUDE_DIRS CACHE STRING "")
+
+if (USE_CYASSL)
+       if ("${CYASSL_LIB}" STREQUAL "" OR "${CYASSL_INCLUDE_DIRS}" STREQUAL "")
+               message(FATAL_ERROR "You must set CYASSL_LIB and CYASSL_INCLUDE_DIRS when USE_CYASSL is turned on")
+       endif()
+endif()
+
+if (WITHOUT_EXTENSIONS)
+       set(LWS_NO_EXTENSIONS 1)
+endif()
+
+if (WITH_SSL)
+       set(LWS_OPENSSL_SUPPORT 1)
+endif()
+
+if (WITH_LATENCY)
+       set(LWS_LATENCY 1)
+endif()
+
+if (WITHOUT_DAEMONIZE)
+       set(LWS_NO_DAEMONIZE 1)
+endif()
+
+if (WITHOUT_SERVER)
+       set(LWS_NO_SERVER 1)
+endif()
+
+if (WITHOUT_CLIENT)
+       set(LWS_NO_CLIENT 1)
+endif()
+
+if (WITHOUT_DEBUG)
+       set(_DEBUG 0)
+else()
+       set(_DEBUG 1)
+endif()
+
+if (MINGW)
+       set(LWS_MINGW_SUPPORT 1)
+endif()
+
+include_directories(${PROJECT_BINARY_DIR})
+
+include(CheckCSourceCompiles)
+
+# Check for different inline keyword versions.
+foreach(KEYWORD "inline" "__inline__" "__inline")
+       set(CMAKE_REQUIRED_DEFINITIONS "-DKEYWORD=${KEYWORD}")
+       CHECK_C_SOURCE_COMPILES(
+               "
+               #include <stdio.h>
+               KEYWORD void a() {}
+               int main(int argc, char **argv) { a(); return 0; }
+               " HAVE_${KEYWORD})
+endforeach()
+
+if (NOT HAVE_inline)
+       if (HAVE___inline__)
+               set(inline __inline__)
+       elseif(HAVE___inline)
+               set(inline __inline)
+       endif()
+endif()
+
+# Put the libaries and binaries that get built into directories at the
+# top of the build tree rather than in hard-to-find leaf directories. 
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+
+# So we can include the CMake generated config file only when
+# building with CMAKE.
+add_definitions(-DCMAKE_BUILD)
+
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
+
+CHECK_FUNCTION_EXISTS(bzero HAVE_BZERO)
+CHECK_FUNCTION_EXISTS(fork HAVE_FORK)
+CHECK_FUNCTION_EXISTS(malloc HAVE_MALLOC)
+CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET)
+CHECK_FUNCTION_EXISTS(realloc HAVE_REALLOC)
+CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET)
+CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
+CHECK_FUNCTION_EXISTS(vfork HAVE_VFORK)
+CHECK_FUNCTION_EXISTS(getifaddrs HAVE_GETIFADDRS)
+
+if (NOT HAVE_GETIFADDRS)
+       if (WITHOUT_BUILTIN_GETIFADDRS)
+               message(FATAL_ERROR "No getifaddrs was found on the system. Turn off the WITHOUT_BUILTIN_GETIFADDRS compile option to use the supplied BSD version.")
+       endif()
+
+       set(LWS_BUILTIN_GETIFADDRS 1)
+endif()
+
+CHECK_INCLUDE_FILE(dlfcn.h HAVE_DLFCN_H)
+CHECK_INCLUDE_FILE(fcntl.h HAVE_FCNTL_H)
+CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILE(memory.h HAVE_MEMORY_H)
+CHECK_INCLUDE_FILE(netinet/in.h HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
+CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
+CHECK_INCLUDE_FILE(sys/prctl.h HAVE_SYS_PRCTL_H)
+CHECK_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H)
+CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE(vfork.h HAVE_VFORK_H)
+CHECK_INCLUDE_FILE(zlib.h HAVE_ZLIB_H)
+
+# TODO: These can be tested if they actually work also...
+set(HAVE_WORKING_FORK HAVE_FORK)
+set(HAVE_WORKING_VFORK HAVE_VFORK)
+
+CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
+
+if (NOT HAVE_SYS_TYPES_H)
+       set(pid_t int)
+       set(size_t "unsigned int")
+endif()
+
+if (NOT HAVE_MALLOC)
+       set(malloc rpl_malloc)
+endif()
+
+if (NOT HAVE_REALLOC)
+       set(realloc rpl_realloc)
+endif()
+
+# Generate the config.h that includes all the compilation settings.
+configure_file(
+               ${PROJECT_SOURCE_DIR}/config.h.cmake 
+               ${PROJECT_BINARY_DIR}/lws_config.h)
+
+if (MSVC)
+       # Turn off stupid microsoft security warnings.
+       add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+endif()
+
+include_directories(${PROJECT_SOURCE_DIR}/lib)
+
+# Group headers and sources.
+# Some IDEs use this for nicer file structure.
+set(HDR_PRIVATE
+       lib/private-libwebsockets.h
+       ${PROJECT_BINARY_DIR}/lws_config.h
+       )
+
+set(HDR_PUBLIC 
+       ${PROJECT_SOURCE_DIR}/lib/libwebsockets.h
+       )
+
+set(SOURCES
+       lib/base64-decode.c
+       lib/handshake.c
+       lib/libwebsockets.c
+       lib/output.c
+       lib/parsers.c
+       lib/sha-1.c
+       )
+
+if (NOT WITHOUT_CLIENT)
+       list(APPEND SOURCES
+               lib/client.c
+               lib/client-handshake.c
+               lib/client-parser.c
+               )
+endif()
+
+if (NOT WITHOUT_SERVER)
+       list(APPEND SOURCES
+               lib/server.c
+               lib/server-handshake.c
+               )
+endif()
+
+if (NOT WITHOUT_EXTENSIONS)
+       list(APPEND HDR_PRIVATE
+               lib/extension-deflate-frame.h
+               lib/extension-deflate-stream.h
+               )
+
+       list(APPEND SOURCES
+               lib/extension.c
+               lib/extension-deflate-frame.c
+               lib/extension-deflate-stream.c
+               )
+endif()
+
+# Add helper files for Windows.
+if (WIN32)
+       set(WIN32_HELPERS_PATH win32port/win32helpers)
+
+       list(APPEND HDR_PRIVATE
+               ${WIN32_HELPERS_PATH}/websock-w32.h
+               ${WIN32_HELPERS_PATH}/gettimeofday.h
+               )
+if (MINGW)
+       list(APPEND SOURCES
+               ${WIN32_HELPERS_PATH}/gettimeofday.c
+               )
+else()
+       list(APPEND SOURCES 
+               ${WIN32_HELPERS_PATH}/websock-w32.c
+               ${WIN32_HELPERS_PATH}/gettimeofday.c
+               )
+endif()
+       include_directories(${WIN32_HELPERS_PATH})
+else()
+       # Unix.
+       if (NOT WITHOUT_DAEMONIZE)
+               list(APPEND SOURCES
+                       lib/daemonize.c
+                       )
+       endif()
+endif()
+
+if (UNIX)
+       if (NOT HAVE_GETIFADDRS)
+               list(APPEND HDR_PRIVATE lib/getifaddrs.h)
+               list(APPEND SOURCES lib/getifaddrs.c)
+       endif()
+endif()
+
+source_group("Headers Private"  FILES ${HDR_PRIVATE})
+source_group("Headers Public"   FILES ${HDR_PUBLIC})
+source_group("Sources"          FILES ${SOURCES})
+
+#
+# Create the lib.
+#
+add_library(websockets STATIC
+                       ${HDR_PRIVATE}
+                       ${HDR_PUBLIC}
+                       ${SOURCES})
+add_library(websockets_shared SHARED
+                       ${HDR_PRIVATE}
+                       ${HDR_PUBLIC}
+                       ${SOURCES})
+
+if (WIN32)
+       # On Windows libs have the same file ending (.lib)
+       # for both static and shared libraries, so we
+       # need a unique name for the static one.
+       set_target_properties(websockets 
+               PROPERTIES
+               OUTPUT_NAME websockets_static)
+
+       # Compile as DLL (export function declarations)
+       set_property(
+               TARGET websockets_shared
+               PROPERTY COMPILE_DEFINITIONS 
+               LWS_DLL
+               LWS_INTERNAL
+               )
+endif()
+
+# We want the shared lib to be named "libwebsockets"
+# not "libwebsocket_shared".
+set_target_properties(websockets_shared
+               PROPERTIES 
+               OUTPUT_NAME websockets)
+
+# Set the so version of the lib.
+# Equivalent to LDFLAGS=-version-info 3:0:0
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+       foreach(lib websockets websockets_shared)
+               set_target_properties(${lib} 
+                       PROPERTIES
+                       SOVERSION ${SOVERSION})
+       endforeach()
+endif()
+
+set(LIB_LIST)
+
+#
+# Find libraries.
+#
+
+#
+# SD_DAEMON (Only needed if systemd socket activation is desired.)
+#
+if (WITH_SD_DAEMON)
+       find_package(PkgConfig)
+       pkg_check_modules(SD_DAEMON REQUIRED libsystemd-daemon)
+
+       include_directories(${SD_DAEMON_INCLUDE_DIRS})
+       list(APPEND LIB_LIST ${SD_DAEMON_LIBRARIES})
+       add_definitions(${SD_DAEMON_CFLAGS_OTHER})
+       add_definitions(-DHAVE_SYSTEMD_DAEMON)
+endif()
+
+#
+# ZLIB (Only needed for deflate extensions).
+#
+if (NOT WITHOUT_EXTENSIONS)
+       if (WIN32 AND NOT USE_EXTERNAL_ZLIB)
+               message("Using included Zlib version")
+
+               # Compile ZLib if needed.
+               set(WIN32_ZLIB_PATH "win32port/zlib")
+               set(ZLIB_SRCS
+                       ${WIN32_ZLIB_PATH}/adler32.c
+                       ${WIN32_ZLIB_PATH}/compress.c
+                       ${WIN32_ZLIB_PATH}/crc32.c
+                       ${WIN32_ZLIB_PATH}/deflate.c
+                       ${WIN32_ZLIB_PATH}/gzclose.c
+                       ${WIN32_ZLIB_PATH}/gzio.c
+                       ${WIN32_ZLIB_PATH}/gzlib.c
+                       ${WIN32_ZLIB_PATH}/gzread.c
+                       ${WIN32_ZLIB_PATH}/gzwrite.c
+                       ${WIN32_ZLIB_PATH}/infback.c
+                       ${WIN32_ZLIB_PATH}/inffast.c
+                       ${WIN32_ZLIB_PATH}/inflate.c
+                       ${WIN32_ZLIB_PATH}/inftrees.c
+                       ${WIN32_ZLIB_PATH}/trees.c
+                       ${WIN32_ZLIB_PATH}/uncompr.c
+                       ${WIN32_ZLIB_PATH}/zutil.c
+               )
+
+               # Create the library.
+               add_library(ZLIB STATIC ${ZLIB_SRCS})
+
+               # Set the same variables as find_package would.
+               set(ZLIB_INCLUDE_DIRS ${WIN32_ZLIB_PATH})
+               get_property(ZLIB_LIBRARIES TARGET ZLIB PROPERTY LOCATION)
+               set(ZLIB_FOUND 1)
+       else()
+               find_package(ZLIB REQUIRED)
+       endif()
+
+       # Make sure ZLib is compiled before the libs.
+       foreach (lib websockets websockets_shared)
+               add_dependencies(${lib} ZLIB)
+       endforeach()
+
+       message("ZLib include dirs: ${ZLIB_INCLUDE_DIRS}")
+       message("ZLib libraries: ${ZLIB_LIBRARIES}")
+       include_directories(${ZLIB_INCLUDE_DIRS})
+       list(APPEND LIB_LIST ${ZLIB_LIBRARIES})
+endif(NOT WITHOUT_EXTENSIONS)
+
+#
+# OpenSSL
+#
+if (WITH_SSL)
+       message("Compiling with SSL support")
+
+       if (USE_CYASSL)
+               # Use CyaSSL as OpenSSL replacement.
+               # TODO: Add a find_package command for this also.
+               message("CyaSSL include dir: ${CYASSL_INCLUDE_DIRS}")
+               message("CyaSSL libraries: ${CYASSL_LIB}")
+
+               # Additional to the root directory we need to include
+               # the cyassl/ subdirectory which contains the OpenSSL
+               # compatability layer headers.
+               foreach(inc ${CYASSL_INCLUDE_DIRS})
+                       include_directories(${inc} ${inc}/cyassl)
+               endforeach()
+
+               list(APPEND ${LIB_LIST} ${CYASSL_LIB})
+       else()
+               # TODO: Add support for STATIC also.
+               find_package(OpenSSL REQUIRED)
+
+               message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
+               message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
+
+               include_directories(${OPENSSL_INCLUDE_DIR})
+               list(APPEND LIB_LIST ${OPENSSL_LIBRARIES})
+       endif()
+endif(WITH_SSL)
+
+#
+# Platform specific libs.
+#
+if (WIN32)
+       list(APPEND LIB_LIST ws2_32.lib)
+endif()
+
+if (UNIX)
+       list(APPEND LIB_LIST m)
+endif()
+
+# Setup the linking for all libs.
+foreach (lib websockets websockets_shared)
+       target_link_libraries(${lib} ${LIB_LIST})
+endforeach()
+
+#
+# Test applications
+#
+set(TEST_APP_LIST)
+if (NOT WITHOUT_TESTAPPS)
+       #
+       # Helper function for adding a test app.
+       #
+       macro(create_test_app TEST_NAME MAIN_SRC WIN32_SRCS WIN32_HDRS)
+               
+               set(TEST_SRCS ${MAIN_SRC})
+               set(TEST_HDR)
+
+               if (WIN32)
+                       list(APPEND TEST_SRCS 
+                               ${WIN32_HELPERS_PATH}/getopt.c
+                               ${WIN32_HELPERS_PATH}/getopt_long.c
+                               ${WIN32_HELPERS_PATH}/gettimeofday.c
+                               ${WIN32_SRCS})
+
+                       list(APPEND TEST_HDR 
+                               ${WIN32_HELPERS_PATH}/getopt.h
+                               ${WIN32_HELPERS_PATH}/gettimeofday.h
+                               ${WIN32_HDRS})
+               endif(WIN32)
+
+               source_group("Headers Private"   FILES ${TEST_HDR})
+               source_group("Sources"   FILES ${TEST_SRCS})
+               add_executable(${TEST_NAME} ${TEST_SRCS} ${TEST_HDR})
+               
+               if (LINK_TESTAPPS_DYNAMIC)
+                       target_link_libraries(${TEST_NAME} websockets_shared)
+                       add_dependencies(${TEST_NAME} websockets_shared)
+               else()
+                       target_link_libraries(${TEST_NAME} websockets)
+                       add_dependencies(${TEST_NAME} websockets)
+               endif()
+
+               # Set test app specific defines.
+               set_property(TARGET ${TEST_NAME}
+                                       PROPERTY COMPILE_DEFINITIONS 
+                                               INSTALL_DATADIR="${SSL_CERT_DIR}"
+                                       )
+
+               # Prefix the binary names with libwebsockets.
+               set_target_properties(${TEST_NAME} 
+                       PROPERTIES
+                       OUTPUT_NAME libwebsockets-${TEST_NAME})
+
+               # Add to the list of tests.
+               list(APPEND TEST_APP_LIST ${TEST_NAME})
+       endmacro()
+
+       if (WITH_SSL AND NOT USE_CYASSL)
+               message("Searching for OpenSSL executable and dlls")
+               find_package(OpenSSLbins)
+               message("OpenSSL executable: ${OPENSSL_EXECUTABLE}")
+       endif()
+
+       if (NOT WITHOUT_SERVER)
+               #
+               # test-server
+               #
+               if (NOT WITHOUT_TEST_SERVER)
+                       create_test_app(test-server
+                               "test-server/test-server.c"
+                               ""
+                               "${WIN32_HELPERS_PATH}/netdb.h;${WIN32_HELPERS_PATH}/strings.h;${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/websock-w32.h")
+               endif()
+
+               #
+               # test-server-extpoll
+               #
+               if (NOT WITHOUT_TEST_SERVER_EXTPOLL)
+                       create_test_app(test-server-extpoll
+                               "test-server/test-server.c"
+                               "win32port/win32helpers/websock-w32.c"
+                               "${WIN32_HELPERS_PATH}/netdb.h;${WIN32_HELPERS_PATH}/strings.h;${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/websock-w32.h")
+                       # Set defines for this executable only.
+                       set_property(
+                               TARGET test-server-extpoll
+                               PROPERTY COMPILE_DEFINITIONS 
+                                       EXTERNAL_POLL 
+                                       INSTALL_DATADIR="${SSL_CERT_DIR}"
+                               )
+
+                       # We need to link against winsock code.
+                       if (WIN32)
+                               target_link_libraries(test-server-extpoll ws2_32.lib)
+                       endif()
+               endif()
+
+               # Data files for running the test server.
+               set(TEST_SERVER_DATA
+                       ${PROJECT_SOURCE_DIR}/test-server/favicon.ico 
+                       ${PROJECT_SOURCE_DIR}/test-server/leaf.jpg
+                       ${PROJECT_SOURCE_DIR}/test-server/libwebsockets.org-logo.png
+                       ${PROJECT_SOURCE_DIR}/test-server/test.html)
+
+               # Generate self-signed SSL certs for the test-server.
+               if (WITH_SSL AND OPENSSL_EXECUTABLE)
+                       message("Generating SSL Certificates for the test-server...")
+
+                       set(TEST_SERVER_SSL_KEY ${PROJECT_BINARY_DIR}/libwebsockets-test-server.key.pem)
+                       set(TEST_SERVER_SSL_CERT ${PROJECT_BINARY_DIR}/libwebsockets-test-server.pem)
+
+                       if (WIN32)
+                               file(WRITE ${PROJECT_BINARY_DIR}/openssl_input.txt
+                                       "GB\n"
+                                       "Erewhon\n"
+                                       "All around\n"
+                                       "libwebsockets-test\n"
+                                       "localhost\n"
+                                       "none@invalid.org\n\n"
+                                       )
+                               
+                               # The "type" command is a bit picky with paths.
+                               file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}/openssl_input.txt" OPENSSL_INPUT_WIN_PATH)
+
+                               execute_process(
+                                       COMMAND cmd /c type "${OPENSSL_INPUT_WIN_PATH}"
+                                       COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
+                                       RESULT_VARIABLE OPENSSL_RETURN_CODE)
+                               
+                               message("\n")
+
+                               if (OPENSSL_RETURN_CODE)
+                                       message("!!! Failed to generate SSL certificate:\n${OPENSSL_RETURN_CODE} !!!")
+                               endif()
+                       else()
+                               execute_process(
+                                       COMMAND printf "GB\\nErewhon\\nAll around\\nlibwebsockets-test\\n\\nlocalhost\\nnone@invalid.org\\n"
+                                       COMMAND ${OPENSSL_EXECUTABLE} 
+                                               req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout ${TEST_SERVER_SSL_KEY} -out ${TEST_SERVER_SSL_CERT}
+                                       )
+                       endif()
+
+                       list(APPEND TEST_SERVER_DATA 
+                               ${TEST_SERVER_SSL_KEY} 
+                               ${TEST_SERVER_SSL_CERT})
+               endif()
+
+               # Copy the file needed to run the server so that the test apps can
+               # reach them from their default output location
+               foreach (TEST_FILE ${TEST_SERVER_DATA})
+                       add_custom_command(TARGET test-server
+                                               POST_BUILD 
+                                               COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server"
+                                               COMMAND ${CMAKE_COMMAND} -E copy ${TEST_FILE} "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server" VERBATIM)
+               endforeach()
+       endif(NOT WITHOUT_SERVER)
+
+       if (NOT WITHOUT_CLIENT)
+               #
+               # test-client
+               #
+               if (NOT WITHOUT_TEST_CLIENT)
+                       create_test_app(test-client
+                               "test-server/test-client.c"
+                               ""
+                               "")
+               endif()
+
+               #
+               # test-fraggle
+               #
+               if (NOT WITHOUT_TEST_FRAGGLE)
+                       create_test_app(test-fraggle
+                               "test-server/test-fraggle.c"
+                               ""
+                               "${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/sys/time.h")
+               endif()
+
+               #
+               # test-ping
+               #
+               if (NOT WITHOUT_TEST_PING)
+                       create_test_app(test-ping
+                               "test-server/test-ping.c"
+                               ""
+                               "${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/sys/time.h")
+               endif()
+       endif(NOT WITHOUT_CLIENT)
+
+       #
+       # Copy OpenSSL dlls to the output directory on Windows.
+       # (Otherwise we'll get an error when trying to run)
+       #
+       if (WIN32 AND WITH_SSL AND NOT USE_CYASSL)
+               if(OPENSSL_BIN_FOUND)
+                       message("OpenSSL dlls found:")
+                       message("  Libeay: ${LIBEAY_BIN}")
+                       message("  SSLeay: ${SSLEAY_BIN}")
+
+                       foreach(TARGET_BIN ${TEST_APP_LIST})                    
+                               add_custom_command(TARGET ${TARGET_BIN}
+                                       POST_BUILD 
+                                       COMMAND ${CMAKE_COMMAND} -E copy ${LIBEAY_BIN} $<TARGET_FILE_DIR:${TARGET_BIN}> VERBATIM)
+                                       
+                               add_custom_command(TARGET ${TARGET_BIN}
+                                       POST_BUILD 
+                                       COMMAND ${CMAKE_COMMAND} -E copy ${SSLEAY_BIN} $<TARGET_FILE_DIR:${TARGET_BIN}> VERBATIM)
+                       endforeach()
+               endif()
+       endif()
+endif(NOT WITHOUT_TESTAPPS)
+
+if (UNIX)
+       # Generate documentation.
+       # TODO: Fix this on Windows.
+       message("Generating API documentation")
+       file(GLOB C_FILES ${PROJECT_SOURCE_DIR}/lib/*.c)
+       execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/doc/)
+
+       execute_process(
+               COMMAND ${PROJECT_SOURCE_DIR}/scripts/kernel-doc -html ${C_FILES} ${HDR_PUBLIC} 
+               OUTPUT_FILE ${PROJECT_BINARY_DIR}/doc/libwebsockets-api-doc.html
+               ERROR_QUIET)
+
+       execute_process(
+               COMMAND ${PROJECT_SOURCE_DIR}/scripts/kernel-doc -text ${C_FILES} ${HDR_PUBLIC}
+               OUTPUT_FILE ${PROJECT_BINARY_DIR}/doc/libwebsockets-api-doc.txt
+               ERROR_QUIET)
+
+# Generate and install pkgconfig.
+# (This is not indented, because the tabs will be part of the output)
+file(WRITE ${PROJECT_BINARY_DIR}/libwebsockets.pc
+"prefix=/usr/local
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib${LIB_SUFFIX}
+includedir=\${prefix}/include
+
+Name: libwebsockets
+Description: Websockets server and client library
+Version: ${PACKAGE_VERSION}
+
+Libs: -L\${libdir} -lwebsockets
+Cflags: -I\${includedir}"
+)
+
+       install(FILES ${PROJECT_BINARY_DIR}/libwebsockets.pc
+               DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+endif()
+
+# Install headers.
+install(FILES ${HDR_PUBLIC} 
+               DESTINATION include
+               COMPONENT headers)
+set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
+
+# Install libs.
+install(TARGETS websockets websockets_shared
+               LIBRARY DESTINATION lib${LIB_SUFFIX}
+               ARCHIVE DESTINATION lib${LIB_SUFFIX}
+               COMPONENT libraries)
+set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
+
+# Install test apps.
+if (NOT WITHOUT_TESTAPPS)
+       install(TARGETS test-client ${TEST_APP_LIST}
+                       RUNTIME DESTINATION /opt/usr/devel/usr/bin
+                       COMPONENT examples)
+       set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Example Install")
+endif()
+
+# Programs shared files used by the test-server.
+if (NOT WITHOUT_TESTAPPS AND NOT WITHOUT_SERVER)
+       install(FILES ${TEST_SERVER_DATA}
+                       DESTINATION /opt/usr/devel/usr/share/libwebsockets-test-server
+                       COMPONENT examples)
+endif()
+
+# Most people are more used to "make dist" compared to "make package_source"
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+# This must always be last!
+include(CPack)
diff --git a/INSTALL b/INSTALL
new file mode 100644 (file)
index 0000000..7d1c323
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,365 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..7c89865
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,526 @@
+Libwebsockets and included programs are provided under the terms of the GNU
+Library General Public License (LGPL) 2.1, with the following exceptions:
+
+1) Static linking of programs with the libwebsockets library does not
+constitute a derivative work and does not require the author to provide 
+source code for the program, use the shared libwebsockets libraries, or
+link their program against a user-supplied version of libwebsockets.
+
+If you link the program to a modified version of libwebsockets, then the
+changes to libwebsockets must be provided under the terms of the LGPL in
+sections 1, 2, and 4.
+
+2) You do not have to provide a copy of the libwebsockets license with
+programs that are linked to the libwebsockets library, nor do you have to
+identify the libwebsockets license in your program or documentation as
+required by section 6 of the LGPL.
+
+However, programs must still identify their use of libwebsockets. The
+following example statement can be included in user documentation to
+satisfy this requirement:
+
+"[program] is based in part on the work of the libwebsockets  project
+(http://libwebsockets.org)"
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+\f
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+\f
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+\f
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+\f
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+\f
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+\f
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+\f
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+\f
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+\f
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..28a04bb
--- /dev/null
@@ -0,0 +1,13 @@
+
+if NO_TESTAPPS
+SUBDIRS=lib
+else 
+SUBDIRS=lib test-server
+endif
+
+EXTRA_DIST=scripts/kernel-doc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libwebsockets.pc
+
+
diff --git a/README b/README
new file mode 100644 (file)
index 0000000..37436e8
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+This is the libwebsockets C library for lightweight websocket clients and
+servers.  For support, visit
+
+ http://libwebsockets.org
+
+and consider joining the project mailing list at
+
+ http://ml.libwebsockets.org/mailman/listinfo/libwebsockets
+
+You can get the latest version of the library from git
+
+http://git.libwebsockets.org
+https://github.com/warmcat/libwebsockets
+
+for more information:
+
+README.build      - information on building the library
+README.coding     - information for writing code using the library
+README.test-apps  - information about the test apps built with the library
+
diff --git a/README.build b/README.build
new file mode 100644 (file)
index 0000000..3994c9c
--- /dev/null
@@ -0,0 +1,415 @@
+Introduction
+------------
+Libwebsockets can be built using two different build systems
+autoconf or CMake. autoconf only works on Unix systems, or mingw/cygwin
+on Windows. CMake works differently and can generate platform specific
+project files for most popular IDEs and build systems.
+
+################################### Autoconf ###################################
+
+Building the library and test apps
+----------------------------------
+
+You need to regenerate the autotools and libtoolize stuff for your system
+
+$ ./autogen.sh
+
+Then,
+
+------Fedora x86_64
+
+ ./configure --prefix=/usr --libdir=/usr/lib64 --enable-openssl
+
+------Apple
+
+Christopher Baker reported that this is needed
+
+./configure CC="gcc -arch i386 -arch x86_64" CXX="g++ -arch i386 -arch
+x86_64" CPP="gcc -E" CXXCPP="g++ -E" --enable-nofork
+
+------mingw
+
+I did the following to get working build, ping test is disabled when
+building this way
+
+1) install mingw64_w32 compiler packages from Fedora
+2) additionally install mingw64-zlib package
+3) ./configure --prefix=/usr --enable-mingw --host=x86_64-w64-mingw32
+4) make
+
+------MIPS cross-build using OpenWRT
+
+ ./configure --prefix=/usr --without-extensions --host mips-openwrt-linux
+
+I did not try building the extensions since they need cross-zlib, but it
+should also be workable.
+
+------Other uClibc
+
+you may need --enable-builtin-getifaddrs if your toolchain
+doesn't have it - openWRT uclibc has it so you don't need this option.
+
+------ARM cross-build
+
+./configure --prefix=/usr --host=arm-linux-gnueabi --without-client --without-extensions
+
+you can build cross with client and extensions perfectly well, but
+apart from the size shrink this has the nice characteristic that no
+non-toolchain libraries are needed to build it.
+
+
+otherwise if /usr/local/... and /usr/local/lib are OK then...
+
+$ ./configure
+$ make clean
+$ make && sudo make install
+$ libwebsockets-test-server
+
+should be enough to get a test server listening on port 7861.
+
+
+Configure script options
+------------------------
+
+There are several other possible configure options
+
+--enable-openssl       Builds in the SSL support
+
+--with-cyassl          Use cyassl instead of OpenSSL... you will need CyaSSL
+                       to have been configured with --enable-opensslExtra
+\                      when it was built.
+
+--enable-libcrypto     by default libwebsockets uses its own
+                       built-in md5 and sha-1 implementation for
+                       simplicity.  However the libcrypto ones
+                       may be faster, and in a distro context it
+                       may be highly desirable to use a common
+                       library implementation for ease of security
+                       upgrades.  Give this configure option
+                       to disable the built-in ones and force use
+                       of the libcrypto (part of openssl) ones.
+
+--with-client-cert-dir=dir   tells the client ssl support where to
+                            look for trust certificates to validate
+                            the remote certificate against.
+
+--enable-noping                Don't try to build the ping test app
+                       It needs some unixy environment that
+                       may choke in other build contexts, this
+                       lets you cleanly stop it being built
+                       
+--enable-builtin-getifaddrs  if your libc lacks getifaddrs, you can build an
+                       implementation into the library.  By default your libc
+                       one is used.
+
+--without-testapps     Just build the library not the test apps
+
+--without-client       Don't build the client part of the library nor the
+                       test apps that need the client part.  Useful to
+                       minimize library footprint for embedded server-only
+                       case
+
+--without-server       Don't build the server part of the library nor the
+                       test apps that need the server part.  Useful to
+                       minimize library footprint for embedded client-only
+                       case
+
+--without-daemonize    Don't build daemonize.c / lws_daemonize
+
+--disable-debug                Remove all debug logging below lwsl_notice in severity
+                       from the code -- it's not just defeated from logging
+                       but removed from compilation
+
+--without-extensions   Remove all code and data around protocol extensions.
+                       This reduces the code footprint considerably but
+                       you will lose extension features like compression.
+                       However that may be irrelevant for embedded use and
+                       the code / data size / speed improvements may be
+                       critical.
+
+--with-latency         Builds the latency-tracking code into the library...
+                       this slows your library down a bit but is very useful
+                       to find the cause of unexpected latencies occurring
+                       inside the library.  See README.test-apps for more
+                       info
+
+
+Externally configurable important constants
+-------------------------------------------
+
+You can control these from configure by just setting them as commandline
+args throgh CFLAGS, eg
+
+./configure CFLAGS="-DLWS_MAX_ZLIB_CONN_BUFFER=8192"
+
+
+They all have reasonable defaults usable for all use-cases except resource-
+constrained, so you only need to take care about them if you want to tune them
+to the amount of memory available.
+
+ - LWS_MAX_HEADER_LEN default 1024: allocated area to copy http headers that
+libwebsockets knows about into.  You only need to think about increasing this
+if your application might have monster length URLs for example, or some other
+header that lws cares about will be abnormally large (headers it does not
+know about are skipped).
+
+ - LWS_MAX_PROTOCOLS default 5: largest amount of different protocols the
+server can serve
+
+ - LWS_MAX_EXTENSIONS_ACTIVE default 3: largest amount of extensions we can
+choose to have active on one connection
+
+ - SPEC_LATEST_SUPPORTED default 13: only change if you want to remove support
+for later protocol versions... unlikely
+
+ - AWAITING_TIMEOUT default 5: after this many seconds without a response, the
+server will hang up on the client
+
+ - SYSTEM_RANDOM_FILEPATH default "/dev/urandom": if your random device differs
+you can set it here
+
+ - LWS_MAX_ZLIB_CONN_BUFFER  maximum size a compression buffer is allowed to
+grow to before closing the connection.  Some limit is needed or any connecton
+can exhaust all server memory by sending it 4G buffers full of zeros which the
+server is expect to expand atomically.  Default is 64KBytes.
+
+ - LWS_SOMAXCONN  maximum number of pending connect requests the listening
+socket can cope with.  Default is SOMAXCONN.  If you need to use synthetic
+tests that just spam hundreds of connect requests at once without dropping
+any, you can try messing with these as well as ulimit (see later)
+(courtesy Edwin van der Oetelaar)
+
+echo "2048 64512" > /proc/sys/net/ipv4/ip_local_port_range
+echo "1" > /proc/sys/net/ipv4/tcp_tw_recycle
+echo "1" > /proc/sys/net/ipv4/tcp_tw_reuse
+echo "10" > /proc/sys/net/ipv4/tcp_fin_timeout
+echo "65536" > /proc/sys/net/core/somaxconn
+echo "65536" > /proc/sys/net/ipv4/tcp_max_syn_backlog
+echo "262144" > /proc/sys/net/netfilter/nf_conntrack_max
+
+
+Memory efficiency
+-----------------
+
+Embedded server-only configuration without extensions (ie, no compression
+on websocket connections), but with full v13 websocket features and http
+server, built on ARM Cortex-A9:
+
+Update at 8dac94d (2013-02-18)
+
+./configure --without-client --without-extensions --disable-debug --without-daemonize
+
+Context Creation, 1024 fd limit[2]:   16720 (includes 12 bytes per fd)
+Per-connection [3]:                      72 bytes, +1328 during headers
+
+.text  .rodata .data   .bss
+11512  2784    288     4
+
+This shows the impact of the major configuration with/without options at
+13ba5bbc633ea962d46d using Ubuntu ARM on a PandaBoard ES.
+
+These are accounting for static allocations from the library elf, there are
+additional dynamic allocations via malloc.  These are a bit old now but give
+the right idea for relative "expense" of features.
+
+Static allocations, ARM9
+                               .text   .rodata .data   .bss
+ All (no without)              35024   9940    336     4104
+ without client                        25684   7144    336     4104
+ without client, exts          21652   6288    288     4104
+ without client, exts, debug[1]        19756   3768    288     4104
+ without server                        30304   8160    336     4104
+ without server, exts          25382   7204    288     4104
+ without server, exts, debug[1]        23712   4256    288     4104
+
+[1] --disable-debug only removes messages below lwsl_notice.  Since that is
+the default logging level the impact is not noticable, error, warn and notice
+logs are all still there.
+
+[2] 1024 fd per process is the default limit (set by ulimit) in at least Fedora
+and Ubuntu.  You can make significant savings tailoring this to actual expected
+peak fds, ie, at a limit of 20, context creation allocation reduces to 4432 +
+240 = 4672)
+
+[3] known header content is freed after connection establishment
+
+
+#################################### CMake ####################################
+
+CMake is a multi-platform build tool that can generate build files for many
+different target platforms. See more info at http://www.cmake.org
+
+CMake also allows/recommends you to do "out of source"-builds, that is, 
+the build files are separated from your sources, so there is no need to 
+create elaborate clean scripts to get a clean source tree, instead you 
+simply remove your build directory.
+
+Libwebsockets has been tested to build successfully on the following platforms
+with SSL support (both OpenSSL/CyaSSL):
+
+- Windows
+- Linux (x86 and ARM)
+- OSX
+- NetBSD
+
+Building the library and test apps
+----------------------------------
+
+The project settings used by CMake to generate the platform specific build
+files is called CMakeLists.txt. CMake then uses one of its "Generators" to
+output a Visual Studio project or Make file for instance. To see a list of
+the available generators for your platform, simply run the "cmake" command.
+
+Note that by default OpenSSL will be linked, if you don't want SSL support
+see below on how to toggle compile options.
+
+Building on Unix:
+-----------------
+
+1. Install CMake 2.6 or greater: http://cmake.org/cmake/resources/software.html
+   (Most Unix distributions comes with a packaged version also)
+
+2. Install OpenSSL.
+
+3. Generate the build files (default is Make files):
+
+       cd /path/to/src
+       mkdir build
+       cd build
+       cmake ..
+
+       (NOTE: The build/ directory can have any name and be located anywhere
+        on your filesystem, and that the argument ".." given to cmake is simply
+        the source directory of libwebsockets containing the CMakeLists.txt project
+        file. All examples in this file assumes you use "..")
+
+       NOTE2
+       A common option you may want to give is to set the install path, same
+       as --prefix= with autotools.  It defaults to /usr/local.
+       You can do this by, eg
+
+       cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr
+
+       NOTE3
+       On machines that want libraries in lib64, you can also add the
+       following to the cmake line
+
+               -DLIB_SUFFIX=64
+
+4. Finally you can build using the generated Makefile:
+
+       make
+
+Building on Windows (Visual Studio)
+-----------------------------------
+1. Install CMake 2.6 or greater: http://cmake.org/cmake/resources/software.html
+
+2. Install OpenSSL binaries. http://www.openssl.org/related/binaries.html
+   (Preferably in the default location to make it easier for CMake to find them)
+
+3. Generate the Visual studio project by opening the Visual Studio cmd prompt:
+
+   cd <path to src>
+   md build
+   cd build
+   cmake -G "Visual Studio 10" ..
+
+   (NOTE: There is also a cmake-gui available on Windows if you prefer that)
+
+4. Now you should have a generated Visual Studio Solution in  your
+   <path to src>/build directory, which can be used to build.
+
+Setting compile options
+-----------------------
+
+To set compile time flags you can either use one of the CMake gui applications
+or do it via command line.
+
+Command line
+------------
+To list avaialable options (ommit the H if you don't want the help text):
+
+       cmake -LH ..
+
+Then to set an option and build (for example turn off SSL support):
+
+       cmake -DWITH_SSL=0 ..
+or
+       cmake -DWITH_SSL:BOOL=OFF ..
+
+Unix GUI
+--------
+If you have a curses enabled build you simply type:
+(not all packages include this, my debian install does not for example).
+       
+       ccmake
+
+Windows GUI
+-----------
+On windows CMake comes with a gui application:
+       Start -> Programs -> CMake -> CMake (cmake-gui)
+
+CyaSSL replacement for OpenSSL
+------------------------------
+CyaSSL is a lightweight SSL library targeted at embedded system:
+http://www.yassl.com/yaSSL/Products-cyassl.html
+
+It contains a OpenSSL compatability layer which makes it possible to pretty
+much link to it instead of OpenSSL, giving a much smaller footprint.
+
+NOTE: At the time of writing this the current release of CyaSSL contains a 
+crash bug due to some APIs libwebsocket uses. To be able to use this you will
+need to use the current HEAD in their official repository:
+       https://github.com/cyassl/cyassl
+
+NOTE: cyassl needs to be compiled using the --enable-opensslExtra flag for
+this to work.
+
+Compiling libwebsockets with CyaSSL
+-----------------------------------
+
+cmake -DUSE_CYASSL=1 
+         -DCYASSL_INCLUDE_DIRS=/path/to/cyassl 
+         -DCYASSL_LIB=/path/to/cyassl/cyassl.a ..
+
+NOTE: On windows use the .lib file extension for CYASSL_LIB instead.
+
+Cross compiling
+---------------
+To enable cross compiling libwebsockets using CMake you need to create
+a "Toolchain file" that you supply to CMake when generating your build files.
+CMake will then use the cross compilers and build paths specified in this file
+to look for dependencies and such.
+
+Below is an example of how one of these files might look like:
+
+       #
+       # CMake Toolchain file for crosscompiling on ARM.
+       #
+       # This can be used when running cmake in the following way:
+       #  cd build/
+       #  cmake .. -DCMAKE_TOOLCHAIN_FILE=/path/to/this/file/TC_arm-linux-gcc.cmake
+       #
+
+       set(CROSS_PATH /path/to/cross_environment/uClibc)
+
+       # Target operating system name.
+       set(CMAKE_SYSTEM_NAME Linux)
+
+       # Name of C compiler.
+       set(CMAKE_C_COMPILER "${CROSS_PATH}/bin/arm-linux-uclibc-gcc")
+       set(CMAKE_CXX_COMPILER "${CROSS_PATH}/bin/arm-linux-uclibc-g++")
+
+       # Where to look for the target environment. (More paths can be added here)
+       set(CMAKE_FIND_ROOT_PATH "${CROSS_PATH}")
+
+       # Adjust the default behavior of the FIND_XXX() commands:
+       # search programs in the host environment only.
+       set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+       # Search headers and libraries in the target environment only.
+       set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+       set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+Additional information on cross compilation with CMake:
+       http://www.vtk.org/Wiki/CMake_Cross_Compiling
diff --git a/README.coding b/README.coding
new file mode 100644 (file)
index 0000000..0231d03
--- /dev/null
@@ -0,0 +1,226 @@
+Daemonization
+-------------
+
+There's a helper api lws_daemonize built by default that does everything you
+need to daemonize well, including creating a lock file.  If you're making
+what's basically a daemon, just call this early in your init to fork to a
+headless background process and exit the starting process.
+
+Notice stdout, stderr, stdin are all redirected to /dev/null to enforce your
+daemon is headless, so you'll need to sort out alternative logging, by, eg,
+syslog.
+
+
+Maximum number of connections
+-----------------------------
+
+The maximum number of connections the library can deal with is decided when
+it starts by querying the OS to find out how many file descriptors it is
+allowed to open (1024 on Fedora for example).  It then allocates arrays that
+allow up to that many connections, minus whatever other file descriptors are
+in use by the user code.
+
+If you want to restrict that allocation, or increase it, you can use ulimit or
+similar to change the avaiable number of file descriptors, and when restarted
+libwebsockets will adapt accordingly.
+
+
+Libwebsockets is singlethreaded
+-------------------------------
+
+Directly performing websocket actions from other threads is not allowed.
+Aside from the internal data being inconsistent in forked() processes,
+the scope of a wsi (struct websocket) can end at any time during service
+with the socket closing and the wsi freed.
+
+Websocket write activities should only take place in the
+"LWS_CALLBACK_SERVER_WRITEABLE" callback as described below.
+
+Only live connections appear in the user callbacks, so this removes any
+possibility of trying to used closed and freed wsis.
+
+If you need to service other socket or file descriptors as well as the
+websocket ones, you can combine them together with the websocket ones
+in one poll loop, see "External Polling Loop support" below, and
+still do it all in one thread / process context.
+
+
+Only send data when socket writeable
+------------------------------------
+
+You should only send data on a websocket connection from the user callback
+"LWS_CALLBACK_SERVER_WRITEABLE" (or "LWS_CALLBACK_CLIENT_WRITEABLE" for
+clients).
+
+If you want to send something, do not just send it but request a callback
+when the socket is writeable using
+
+ - libwebsocket_callback_on_writable(context, wsi) for a specific wsi, or
+ - libwebsocket_callback_on_writable_all_protocol(protocol) for all connections
+using that protocol to get a callback when next writeable.
+
+Usually you will get called back immediately next time around the service
+loop, but if your peer is slow or temporarily inactive the callback will be
+delayed accordingly.  Generating what to write and sending it should be done
+in the ...WRITEABLE callback.
+
+See the test server code for an example of how to do this.
+
+
+Closing connections from the user side
+--------------------------------------
+
+When you want to close a connection, you do it by returning -1 from a
+callback for that connection.
+
+You can provoke a callback by calling libwebsocket_callback_on_writable on
+the wsi, then notice in the callback you want to close it and just return -1.
+But usually, the decision to close is made in a callback already and returning
+-1 is simple.
+
+If the socket knows the connection is dead, because the peer closed or there
+was an affirmitive network error like a FIN coming, then libwebsockets  will
+take care of closing the connection automatically.
+
+If you have a silently dead connection, it's possible to enter a state where
+the send pipe on the connection is choked but no ack will ever come, so the
+dead connection will never become writeable.  To cover that, you can use TCP
+keepalives (see later in this document)
+
+
+Fragmented messages
+-------------------
+
+To support fragmented messages you need to check for the final
+frame of a message with libwebsocket_is_final_fragment. This
+check can be combined with libwebsockets_remaining_packet_payload
+to gather the whole contents of a message, eg:
+
+    case LWS_CALLBACK_RECEIVE:
+    {
+        Client * const client = (Client *)user;
+        const size_t remaining = libwebsockets_remaining_packet_payload(wsi);
+
+        if (!remaining && libwebsocket_is_final_fragment(wsi)) {
+            if (client->HasFragments()) {
+                client->AppendMessageFragment(in, len, 0);
+                in = (void *)client->GetMessage();
+                len = client->GetMessageLength();
+            }
+
+            client->ProcessMessage((char *)in, len, wsi);
+            client->ResetMessage();
+        } else
+            client->AppendMessageFragment(in, len, remaining);
+    }
+    break;
+
+The test app llibwebsockets-test-fraggle sources also show how to
+deal with fragmented messages.
+
+
+Debug Logging
+-------------
+
+Also using lws_set_log_level api you may provide a custom callback to actually
+emit the log string.  By default, this points to an internal emit function
+that sends to stderr.  Setting it to NULL leaves it as it is instead.
+
+A helper function lwsl_emit_syslog() is exported from the library to simplify
+logging to syslog.  You still need to use setlogmask, openlog and closelog
+in your user code.
+
+The logging apis are made available for user code.
+
+lwsl_err(...)
+lwsl_warn(...)
+lwsl_notice(...)
+lwsl_info(...)
+lwsl_debug(...)
+
+The difference between notice and info is that notice will be logged by default
+whereas info is ignored by default.
+
+
+External Polling Loop support
+-----------------------------
+
+libwebsockets maintains an internal poll() array for all of its
+sockets, but you can instead integrate the sockets into an
+external polling array.  That's needed if libwebsockets will
+cooperate with an existing poll array maintained by another
+server.
+
+Four callbacks LWS_CALLBACK_ADD_POLL_FD, LWS_CALLBACK_DEL_POLL_FD,
+LWS_CALLBACK_SET_MODE_POLL_FD and LWS_CALLBACK_CLEAR_MODE_POLL_FD
+appear in the callback for protocol 0 and allow interface code to
+manage socket descriptors in other poll loops.
+
+
+Using with in c++ apps
+----------------------
+
+The library is ready for use by C++ apps.  You can get started quickly by
+copying the test server
+
+$ cp test-server/test-server.c test.cpp
+
+and building it in C++ like this
+
+$ g++ -DINSTALL_DATADIR=\"/usr/share\" -ocpptest test.cpp -lwebsockets
+
+INSTALL_DATADIR is only needed because the test server uses it as shipped, if
+you remove the references to it in your app you don't need to define it on
+the g++ line either.
+
+
+Availability of header information
+----------------------------------
+
+From v1.2 of the library onwards, the HTTP header content is free()d as soon
+as the websocket connection is established.  For websocket servers, you can
+copy interesting headers by handling LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION
+callback, for clients there's a new callback just for this purpose
+LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH.
+
+
+TCP Keepalive
+-------------
+
+It is possible for a connection which is not being used to send to die
+silently somewhere between the peer and the side not sending.  In this case
+by default TCP will just not report anything and you will never get any more
+incoming data or sign the link is dead until you try to send.
+
+To deal with getting a notification of that situation, you can choose to
+enable TCP keepalives on all libwebsockets sockets, when you create the
+context.
+
+To enable keepalive, set the ka_time member of the context creation parameter
+struct to a nonzero value (in seconds) at context creation time.  You should
+also fill ka_probes and ka_interval in that case.
+
+With keepalive enabled, the TCP layer will send control packets that should
+stimulate a response from the peer without affecting link traffic.  If the
+response is not coming, the socket will announce an error at poll() forcing
+a close.
+
+Note that BSDs don't support keepalive time / probes / inteveral per-socket
+like Linux does.  On those systems you can enable keepalive by a nonzero
+value in ka_time, but the systemwide kernel settings for the time / probes/
+interval are used, regardless of what nonzero value is in ka_time.
+
+Optimizing SSL connections
+--------------------------
+
+There's a member ssl_cipher_list in the lws_context_creation_info struct
+which allows the user code to restrict the possible cipher selection at
+context-creation time.
+
+You might want to look into that to stop the ssl peers selecting a ciher which
+is too computationally expensive.  To use it, point it to a string like
+
+"RC4-MD5:RC4-SHA:AES128-SHA:AES256-SHA:HIGH:!DSS:!aNULL"
+
+if left NULL, then the "DEFAULT" set of ciphers are all possible to select.
+
diff --git a/README.test-apps b/README.test-apps
new file mode 100644 (file)
index 0000000..f8fb050
--- /dev/null
@@ -0,0 +1,272 @@
+Testing server with a browser
+-----------------------------
+
+If you run libwebsockets-test-server and point your browser
+(eg, Chrome) to
+
+  http://127.0.0.1:7681
+
+It will fetch a script in the form of test.html, and then run the
+script in there on the browser to open a websocket connection.
+Incrementing numbers should appear in the browser display.
+
+By default the test server logs to both stderr and syslog, you can control
+what is logged using -d <log level>, see later.
+
+
+Running test server as a Daemon
+-------------------------------
+
+You can use the -D option on the test server to have it fork into the
+background and return immediately.  In this daemonized mode all stderr is
+disabled and logging goes only to syslog, eg, /var/log/messages or similar.
+
+The server maintains a lockfile at /tmp/.lwsts-lock that contains the pid
+of the master process, and deletes this file when the master process
+terminates.
+
+To stop the daemon, do
+
+  kill `cat /tmp/.lwsts-lock`
+
+If it finds a stale lock (the pid mentioned in the file does not exist
+any more) it will delete the lock and create a new one during startup.
+
+If the lock is valid, the daemon will exit with a note on stderr that
+it was already running.s
+
+
+Using SSL on the server side
+----------------------------
+
+To test it using SSL/WSS, just run the test server with
+
+$ libwebsockets-test-server --ssl
+
+and use the URL
+
+  https://127.0.0.1:7681
+
+The connection will be entirely encrypted using some generated
+certificates that your browser will not accept, since they are
+not signed by any real Certificate Authority.  Just accept the
+certificates in the browser and the connection will proceed
+in first https and then websocket wss, acting exactly the
+same.
+
+test-server.c is all that is needed to use libwebsockets for
+serving both the script html over http and websockets.
+
+
+Testing websocket client support
+--------------------------------
+
+If you run the test server as described above, you can also
+connect to it using the test client as well as a browser.
+
+$ libwebsockets-test-client localhost
+
+will by default connect to the test server on localhost:7681
+and print the dumb increment number from the server at the
+same time as drawing random circles in the mirror protocol;
+if you connect to the test server using a browser at the
+same time you will be able to see the circles being drawn.
+
+
+Testing simple echo
+-------------------
+
+You can test against echo.websockets.org as a sanity test like
+this (the client connects to port 80 by default):
+
+$ libwebsockets-test-echo --client echo.websocket.org
+
+This echo test is of limited use though because it doesn't
+negotiate any protocol.  You can run the same test app as a
+local server, by default on localhost:7681
+
+$ libwebsockets-test-echo
+
+and do the echo test against the local echo server
+
+$ libwebsockets-test-echo --client localhost --port 7681
+
+If you add the --ssl switch to both the client and server, you can also test
+with an encrypted link.
+
+
+Testing SSL on the client side
+------------------------------
+
+To test SSL/WSS client action, just run the client test with
+
+$ libwebsockets-test-client localhost --ssl
+
+By default the client test applet is set to accept selfsigned
+certificates used by the test server, this is indicated by the
+use_ssl var being set to 2.  Set it to 1 to reject any server
+certificate that it doesn't have a trusted CA cert for.
+
+
+Using the websocket ping utility
+--------------------------------
+
+libwebsockets-test-ping connects as a client to a remote
+websocket server using 04 protocol and pings it like the
+normal unix ping utility.
+
+$ libwebsockets-test-ping localhost                
+handshake OK for protocol lws-mirror-protocol
+Websocket PING localhost.localdomain (127.0.0.1) 64 bytes of data.
+64 bytes from localhost: req=1 time=0.1ms
+64 bytes from localhost: req=2 time=0.1ms
+64 bytes from localhost: req=3 time=0.1ms
+64 bytes from localhost: req=4 time=0.2ms
+64 bytes from localhost: req=5 time=0.1ms
+64 bytes from localhost: req=6 time=0.2ms
+64 bytes from localhost: req=7 time=0.2ms
+64 bytes from localhost: req=8 time=0.1ms
+^C
+--- localhost.localdomain websocket ping statistics ---
+8 packets transmitted, 8 received, 0% packet loss, time 7458ms
+rtt min/avg/max = 0.110/0.185/0.218 ms
+$
+
+By default it sends 64 byte payload packets using the 04
+PING packet opcode type.  You can change the payload size
+using the -s= flag, up to a maximum of 125 mandated by the
+04 standard.
+
+Using the lws-mirror protocol that is provided by the test
+server, libwebsockets-test-ping can also use larger payload
+sizes up to 4096 is BINARY packets; lws-mirror will copy
+them back to the client and they appear as a PONG.  Use the
+-m flag to select this operation.
+
+The default interval between pings is 1s, you can use the -i=
+flag to set this, including fractions like -i=0.01 for 10ms
+interval.
+
+Before you can even use the PING opcode that is part of the
+standard, you must complete a handshake with a specified
+protocol.  By default lws-mirror-protocol is used which is
+supported by the test server.  But if you are using it on
+another server, you can specify the protcol to handshake with
+by --protocol=protocolname
+
+
+Fraggle test app
+----------------
+
+By default it runs in server mode
+
+$ libwebsockets-test-fraggle
+libwebsockets test fraggle
+(C) Copyright 2010-2011 Andy Green <andy@warmcat.com> licensed under LGPL2.1
+ Compiled with SSL support, not using it
+ Listening on port 7681
+server sees client connect
+accepted v06 connection
+Spamming 360 random fragments
+Spamming session over, len = 371913. sum = 0x2D3C0AE
+Spamming 895 random fragments
+Spamming session over, len = 875970. sum = 0x6A74DA1
+...
+
+You need to run a second session in client mode, you have to
+give the -c switch and the server address at least:
+
+$ libwebsockets-test-fraggle -c localhost 
+libwebsockets test fraggle
+(C) Copyright 2010-2011 Andy Green <andy@warmcat.com> licensed under LGPL2.1
+ Client mode
+Connecting to localhost:7681
+denied deflate-stream extension
+handshake OK for protocol fraggle-protocol
+client connects to server
+EOM received 371913 correctly from 360 fragments
+EOM received 875970 correctly from 895 fragments
+EOM received 247140 correctly from 258 fragments
+EOM received 695451 correctly from 692 fragments
+...
+
+The fraggle test sends a random number up to 1024 fragmented websocket frames
+each of a random size between 1 and 2001 bytes in a single message, then sends
+a checksum and starts sending a new randomly sized and fragmented message.
+
+The fraggle test client receives the same message fragments and computes the
+same checksum using websocket framing to see when the message has ended.  It
+then accepts the server checksum message and compares that to its checksum.
+
+
+proxy support
+-------------
+
+The http_proxy environment variable is respected by the client
+connection code for both ws:// and wss://.  It doesn't support
+authentication.
+
+You use it like this
+
+export http_proxy=myproxy.com:3128
+libwebsockets-test-client someserver.com
+
+
+debug logging
+-------------
+
+By default logging of severity "notice", "warn" or "err" is enabled to stderr.
+
+Again by default other logging is comiled in but disabled from printing.
+
+If you want to eliminate the debug logging below notice  in severity, use the
+--disable-debug configure option to have it removed from the code by the
+preprocesser.
+
+If you want to see more detailed debug logs, you can control a bitfield to
+select which logs types may print using the lws_set_log_level() api, in the
+test apps you can use -d <number> to control this.  The types of logging
+available are (OR together the numbers to select multiple)
+
+ 1   ERR
+ 2   WARN
+ 4   NOTICE
+ 8   INFO
+ 16  DEBUG
+ 32  PARSER
+ 64  HEADER
+ 128 EXTENSION
+ 256 CLIENT
+ 512 LATENCY
+
+
+Websocket version supported
+---------------------------
+
+The final IETF standard is supported for both client and server, protocol
+version 13.
+
+
+Latency Tracking
+----------------
+
+Since libwebsockets runs using poll() and a single threaded approach, any
+unexpected latency coming from system calls would be bad news.  There's now
+a latency tracking scheme that can be built in with --with-latency at
+configure-time, logging the time taken for system calls to complete and if
+the whole action did complete that time or was deferred.
+
+You can see the detailed data by enabling logging level 512 (eg, -d 519 on
+the test server to see that and the usual logs), however even without that
+the "worst" latency is kept and reported to the logs with NOTICE severity
+when the context is destroyed.
+
+Some care is needed interpreting them, if the action completed the first figure
+(in us) is the time taken for the whole action, which may have retried through
+the poll loop many times and will depend on network roundtrip times.  High
+figures here don't indicate a problem.  The figure in us reported after "lat"
+in the logging is the time taken by this particular attempt.  High figures
+here may indicate a problem, or if you system is loaded with another app at
+that time, such as the browser, it may simply indicate the OS gave preferential
+treatment to the other app during that call.
+
diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..5bce9ba
--- /dev/null
@@ -0,0 +1,1578 @@
+#!/bin/sh
+#                        a u t o g e n . s h
+#
+# Copyright (c) 2005-2009 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+#
+# Script for automatically preparing the sources for compilation by
+# performing the myriad of necessary steps.  The script attempts to
+# detect proper version support, and outputs warnings about particular
+# systems that have autotool peculiarities.
+#
+# Basically, if everything is set up and installed correctly, the
+# script will validate that minimum versions of the GNU Build System
+# tools are installed, account for several common configuration
+# issues, and then simply run autoreconf for you.
+#
+# If autoreconf fails, which can happen for many valid configurations,
+# this script proceeds to run manual preparation steps effectively
+# providing a POSIX shell script (mostly complete) reimplementation of
+# autoreconf.
+#
+# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER
+# environment variables and corresponding _OPTIONS variables (e.g.
+# AUTORECONF_OPTIONS) may be used to override the default automatic
+# detection behaviors.  Similarly the _VERSION variables will override
+# the minimum required version numbers.
+#
+# Examples:
+#
+#   To obtain help on usage:
+#     ./autogen.sh --help
+#
+#   To obtain verbose output:
+#     ./autogen.sh --verbose
+#
+#   To skip autoreconf and prepare manually:
+#     AUTORECONF=false ./autogen.sh
+#
+#   To verbosely try running with an older (unsupported) autoconf:
+#     AUTOCONF_VERSION=2.50 ./autogen.sh --verbose
+#
+# Author:
+#   Christopher Sean Morrison <morrison@brlcad.org>
+#
+# Patches:
+#   Sebastian Pipping <sebastian@pipping.org>
+#
+######################################################################
+
+# set to minimum acceptable version of autoconf
+if [ "x$AUTOCONF_VERSION" = "x" ] ; then
+    AUTOCONF_VERSION=2.52
+fi
+# set to minimum acceptable version of automake
+if [ "x$AUTOMAKE_VERSION" = "x" ] ; then
+    AUTOMAKE_VERSION=1.6.0
+fi
+# set to minimum acceptable version of libtool
+if [ "x$LIBTOOL_VERSION" = "x" ] ; then
+    LIBTOOL_VERSION=1.4.2
+fi
+
+
+##################
+# ident function #
+##################
+ident ( ) {
+    # extract copyright from header
+    __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`"
+    if [ "x$__copyright" = "x" ] ; then
+       __copyright="`date +%Y`"
+    fi
+
+    # extract version from CVS Id string
+    __id="$Id: autogen.sh 33925 2009-03-01 23:27:06Z brlcad $"
+    __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`"
+    if [ "x$__version" = "x" ] ; then
+       __version=""
+    fi
+
+    echo "autogen.sh build preparation script by Christopher Sean Morrison"
+    echo "  + config.guess download patch by Sebastian Pipping (2008-12-03)"
+    echo "revised 3-clause BSD-style license, copyright (c) $__copyright"
+    echo "script version $__version, ISO/IEC 9945 POSIX shell script"
+}
+
+
+##################
+# USAGE FUNCTION #
+##################
+usage ( ) {
+    echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]"
+    echo "    --help      Help on $NAME_OF_AUTOGEN usage"
+    echo "    --verbose   Verbose progress output"
+    echo "    --quiet     Quiet suppressed progress output"
+    echo "    --download  Download the latest config.guess from gnulib"
+    echo "    --version   Only perform GNU Build System version checks"
+    echo
+    echo "Description: This script will validate that minimum versions of the"
+    echo "GNU Build System tools are installed and then run autoreconf for you."
+    echo "Should autoreconf fail, manual preparation steps will be run"
+    echo "potentially accounting for several common preparation issues.  The"
+
+    echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER,"
+    echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS"
+    echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the"
+    echo "default automatic detection behavior."
+    echo
+
+    ident
+
+    return 0
+}
+
+
+##########################
+# VERSION_ERROR FUNCTION #
+##########################
+version_error ( ) {
+    if [ "x$1" = "x" ] ; then
+       echo "INTERNAL ERROR: version_error was not provided a version"
+       exit 1
+    fi
+    if [ "x$2" = "x" ] ; then
+       echo "INTERNAL ERROR: version_error was not provided an application name"
+       exit 1
+    fi
+    $ECHO
+    $ECHO "ERROR:  To prepare the ${PROJECT} build system from scratch,"
+    $ECHO "        at least version $1 of $2 must be installed."
+    $ECHO
+    $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will"
+    $ECHO "run configure or make.  Either the GNU Autotools will need to be installed"
+    $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source"
+    $ECHO "code on another system and then transferred to here. -- Cheers!"
+    $ECHO
+}
+
+##########################
+# VERSION_CHECK FUNCTION #
+##########################
+version_check ( ) {
+    if [ "x$1" = "x" ] ; then
+       echo "INTERNAL ERROR: version_check was not provided a minimum version"
+       exit 1
+    fi
+    _min="$1"
+    if [ "x$2" = "x" ] ; then
+       echo "INTERNAL ERROR: version check was not provided a comparison version"
+       exit 1
+    fi
+    _cur="$2"
+
+    # needed to handle versions like 1.10 and 1.4-p6
+    _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`"
+    _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`"
+
+    _min_major="`echo $_min | cut -d. -f1`"
+    _min_minor="`echo $_min | cut -d. -f2`"
+    _min_patch="`echo $_min | cut -d. -f3`"
+
+    _cur_major="`echo $_cur | cut -d. -f1`"
+    _cur_minor="`echo $_cur | cut -d. -f2`"
+    _cur_patch="`echo $_cur | cut -d. -f3`"
+
+    if [ "x$_min_major" = "x" ] ; then
+       _min_major=0
+    fi
+    if [ "x$_min_minor" = "x" ] ; then
+       _min_minor=0
+    fi
+    if [ "x$_min_patch" = "x" ] ; then
+       _min_patch=0
+    fi
+    if [ "x$_cur_minor" = "x" ] ; then
+       _cur_major=0
+    fi
+    if [ "x$_cur_minor" = "x" ] ; then
+       _cur_minor=0
+    fi
+    if [ "x$_cur_patch" = "x" ] ; then
+       _cur_patch=0
+    fi
+
+    $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}"
+
+    if [ $_min_major -lt $_cur_major ] ; then
+       return 0
+    elif [ $_min_major -eq $_cur_major ] ; then
+       if [ $_min_minor -lt $_cur_minor ] ; then
+           return 0
+       elif [ $_min_minor -eq $_cur_minor ] ; then
+           if [ $_min_patch -lt $_cur_patch ] ; then
+               return 0
+           elif [ $_min_patch -eq $_cur_patch ] ; then
+               return 0
+           fi
+       fi
+    fi
+    return 1
+}
+
+
+######################################
+# LOCATE_CONFIGURE_TEMPLATE FUNCTION #
+######################################
+locate_configure_template ( ) {
+    _pwd="`pwd`"
+    if test -f "./configure.ac" ; then
+       echo "./configure.ac"
+    elif test -f "./configure.in" ; then
+       echo "./configure.in"
+    elif test -f "$_pwd/configure.ac" ; then
+       echo "$_pwd/configure.ac"
+    elif test -f "$_pwd/configure.in" ; then
+       echo "$_pwd/configure.in"
+    elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then
+       echo "$PATH_TO_AUTOGEN/configure.ac"
+    elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then
+       echo "$PATH_TO_AUTOGEN/configure.in"
+    fi
+}
+
+
+##################
+# argument check #
+##################
+ARGS="$*"
+PATH_TO_AUTOGEN="`dirname $0`"
+NAME_OF_AUTOGEN="`basename $0`"
+AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN"
+
+LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4"
+
+if [ "x$HELP" = "x" ] ; then
+    HELP=no
+fi
+if [ "x$QUIET" = "x" ] ; then
+    QUIET=no
+fi
+if [ "x$VERBOSE" = "x" ] ; then
+    VERBOSE=no
+fi
+if [ "x$VERSION_ONLY" = "x" ] ; then
+    VERSION_ONLY=no
+fi
+if [ "x$DOWNLOAD" = "x" ] ; then
+    DOWNLOAD=no
+fi
+if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then
+    AUTORECONF_OPTIONS="-i -f"
+fi
+if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then
+    AUTOCONF_OPTIONS="-f"
+fi
+if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then
+    AUTOMAKE_OPTIONS="-a -c -f"
+fi
+ALT_AUTOMAKE_OPTIONS="-a -c"
+if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then
+    LIBTOOLIZE_OPTIONS="--automake -c -f"
+fi
+ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force"
+if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then
+    ACLOCAL_OPTIONS=""
+fi
+if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then
+    AUTOHEADER_OPTIONS=""
+fi
+if [ "x$CONFIG_GUESS_URL" = "x" ] ; then
+    CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD"
+fi
+for arg in $ARGS ; do
+    case "x$arg" in
+       x--help) HELP=yes ;;
+       x-[hH]) HELP=yes ;;
+       x--quiet) QUIET=yes ;;
+       x-[qQ]) QUIET=yes ;;
+       x--verbose) VERBOSE=yes ;;
+       x-[dD]) DOWNLOAD=yes ;;
+       x--download) DOWNLOAD=yes ;;
+       x-[vV]) VERBOSE=yes ;;
+       x--version) VERSION_ONLY=yes ;;
+       *)
+           echo "Unknown option: $arg"
+           echo
+           usage
+           exit 1
+           ;;
+    esac
+done
+
+
+#####################
+# environment check #
+#####################
+
+# sanity check before recursions potentially begin
+if [ ! -f "$AUTOGEN_SH" ] ; then
+    echo "INTERNAL ERROR: $AUTOGEN_SH does not exist"
+    if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then
+       echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH"
+    fi
+    exit 1
+fi
+
+# force locale setting to C so things like date output as expected
+LC_ALL=C
+
+# commands that this script expects
+for __cmd in echo head tail pwd ; do
+    echo "test" | $__cmd > /dev/null 2>&1
+    if [ $? != 0 ] ; then
+       echo "INTERNAL ERROR: '${__cmd}' command is required"
+       exit 2
+    fi
+done
+echo "test" | grep "test" > /dev/null 2>&1
+if test ! x$? = x0 ; then
+    echo "INTERNAL ERROR: grep command is required"
+    exit 1
+fi
+echo "test" | sed "s/test/test/" > /dev/null 2>&1
+if test ! x$? = x0 ; then
+    echo "INTERNAL ERROR: sed command is required"
+    exit 1
+fi
+
+
+# determine the behavior of echo
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+    *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='     ' ;;
+    *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+    *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+# determine the behavior of head
+case "x`echo 'head' | head -n 1 2>&1`" in
+    *xhead*) HEAD_N="n " ;;
+    *) HEAD_N="" ;;
+esac
+
+# determine the behavior of tail
+case "x`echo 'tail' | tail -n 1 2>&1`" in
+    *xtail*) TAIL_N="n " ;;
+    *) TAIL_N="" ;;
+esac
+
+VERBOSE_ECHO=:
+ECHO=:
+if [ "x$QUIET" = "xyes" ] ; then
+    if [ "x$VERBOSE" = "xyes" ] ; then
+       echo "Verbose output quelled by quiet option.  Further output disabled."
+    fi
+else
+    ECHO=echo
+    if [ "x$VERBOSE" = "xyes" ] ; then
+       echo "Verbose output enabled"
+       VERBOSE_ECHO=echo
+    fi
+fi
+
+
+# allow a recursive run to disable further recursions
+if [ "x$RUN_RECURSIVE" = "x" ] ; then
+    RUN_RECURSIVE=yes
+fi
+
+
+################################################
+# check for help arg and bypass version checks #
+################################################
+if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then
+    HELP=yes
+fi
+if [ "x$HELP" = "xyes" ] ; then
+    usage
+    $ECHO "---"
+    $ECHO "Help was requested.  No preparation or configuration will be performed."
+    exit 0
+fi
+
+
+#######################
+# set up signal traps #
+#######################
+untrap_abnormal ( ) {
+    for sig in 1 2 13 15; do
+       trap - $sig
+    done
+}
+
+# do this cleanup whenever we exit.
+trap '
+    # start from the root
+    if test -d "$START_PATH" ; then
+       cd "$START_PATH"
+    fi
+
+    # restore/delete backup files
+    if test "x$PFC_INIT" = "x1" ; then
+       recursive_restore
+    fi
+' 0
+
+# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15)
+for sig in 1 2 13 15; do
+    trap '
+       $ECHO ""
+       $ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'"
+
+       # start from the root
+       if test -d "$START_PATH" ; then
+           cd "$START_PATH"
+       fi
+
+       # clean up on abnormal exit
+       $VERBOSE_ECHO "rm -rf autom4te.cache"
+       rm -rf autom4te.cache
+
+       if test -f "acinclude.m4.$$.backup" ; then
+           $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4"
+           chmod u+w acinclude.m4
+           cat acinclude.m4.$$.backup > acinclude.m4
+
+           $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup"
+           rm -f acinclude.m4.$$.backup
+        fi
+
+       { (exit 1); exit 1; }
+' $sig
+done
+
+
+#############################
+# look for a configure file #
+#############################
+if [ "x$CONFIGURE" = "x" ] ; then
+    CONFIGURE="`locate_configure_template`"
+    if [ ! "x$CONFIGURE" = "x" ] ; then
+       $VERBOSE_ECHO "Found a configure template: $CONFIGURE"
+    fi
+else
+    $ECHO "Using CONFIGURE environment variable override: $CONFIGURE"
+fi
+if [ "x$CONFIGURE" = "x" ] ; then
+    if [ "x$VERSION_ONLY" = "xyes" ] ; then
+       CONFIGURE=/dev/null
+    else
+       $ECHO
+       $ECHO "A configure.ac or configure.in file could not be located implying"
+       $ECHO "that the GNU Build System is at least not used in this directory.  In"
+       $ECHO "any case, there is nothing to do here without one of those files."
+       $ECHO
+       $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`"
+       exit 1
+    fi
+fi
+
+####################
+# get project name #
+####################
+if [ "x$PROJECT" = "x" ] ; then
+    PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[  ]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+    if [ "x$PROJECT" = "xAC_INIT" ] ; then
+       # projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead
+       PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[     ]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+    fi
+    if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then
+       PROJECT="project"
+    fi
+    if [ "x$PROJECT" = "x" ] ; then
+       PROJECT="project"
+    fi
+else
+    $ECHO "Using PROJECT environment variable override: $PROJECT"
+fi
+$ECHO "Preparing the $PROJECT build system...please wait"
+$ECHO
+
+
+########################
+# check for autoreconf #
+########################
+HAVE_AUTORECONF=no
+if [ "x$AUTORECONF" = "x" ] ; then
+    for AUTORECONF in autoreconf ; do
+       $VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version"
+       $AUTORECONF --version > /dev/null 2>&1
+       if [ $? = 0 ] ; then
+           HAVE_AUTORECONF=yes
+           break
+       fi
+    done
+else
+    HAVE_AUTORECONF=yes
+    $ECHO "Using AUTORECONF environment variable override: $AUTORECONF"
+fi
+
+
+##########################
+# autoconf version check #
+##########################
+_acfound=no
+if [ "x$AUTOCONF" = "x" ] ; then
+    for AUTOCONF in autoconf ; do
+       $VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version"
+       $AUTOCONF --version > /dev/null 2>&1
+       if [ $? = 0 ] ; then
+           _acfound=yes
+           break
+       fi
+    done
+else
+    _acfound=yes
+    $ECHO "Using AUTOCONF environment variable override: $AUTOCONF"
+fi
+
+_report_error=no
+if [ ! "x$_acfound" = "xyes" ] ; then
+    $ECHO "ERROR:  Unable to locate GNU Autoconf."
+    _report_error=yes
+else
+    _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
+    if [ "x$_version" = "x" ] ; then
+       _version="0.0.0"
+    fi
+    $ECHO "Found GNU Autoconf version $_version"
+    version_check "$AUTOCONF_VERSION" "$_version"
+    if [ $? -ne 0 ] ; then
+       _report_error=yes
+    fi
+fi
+if [ "x$_report_error" = "xyes" ] ; then
+    version_error "$AUTOCONF_VERSION" "GNU Autoconf"
+    exit 1
+fi
+
+
+##########################
+# automake version check #
+##########################
+_amfound=no
+if [ "x$AUTOMAKE" = "x" ] ; then
+    for AUTOMAKE in automake ; do
+       $VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version"
+       $AUTOMAKE --version > /dev/null 2>&1
+       if [ $? = 0 ] ; then
+           _amfound=yes
+           break
+       fi
+    done
+else
+    _amfound=yes
+    $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE"
+fi
+
+
+_report_error=no
+if [ ! "x$_amfound" = "xyes" ] ; then
+    $ECHO
+    $ECHO "ERROR: Unable to locate GNU Automake."
+    _report_error=yes
+else
+    _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
+    if [ "x$_version" = "x" ] ; then
+       _version="0.0.0"
+    fi
+    $ECHO "Found GNU Automake version $_version"
+    version_check "$AUTOMAKE_VERSION" "$_version"
+    if [ $? -ne 0 ] ; then
+       _report_error=yes
+    fi
+fi
+if [ "x$_report_error" = "xyes" ] ; then
+    version_error "$AUTOMAKE_VERSION" "GNU Automake"
+    exit 1
+fi
+
+
+########################
+# check for libtoolize #
+########################
+HAVE_LIBTOOLIZE=yes
+HAVE_ALT_LIBTOOLIZE=no
+_ltfound=no
+if [ "x$LIBTOOLIZE" = "x" ] ; then
+    LIBTOOLIZE=libtoolize
+    $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version"
+    $LIBTOOLIZE --version > /dev/null 2>&1
+    if [ ! $? = 0 ] ; then
+       HAVE_LIBTOOLIZE=no
+       $ECHO
+       if [ "x$HAVE_AUTORECONF" = "xno" ] ; then
+           $ECHO "Warning:  libtoolize does not appear to be available."
+       else
+           $ECHO "Warning:  libtoolize does not appear to be available.  This means that"
+           $ECHO "the automatic build preparation via autoreconf will probably not work."
+           $ECHO "Preparing the build by running each step individually, however, should"
+           $ECHO "work and will be done automatically for you if autoreconf fails."
+       fi
+
+       # look for some alternates
+       for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do
+           $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version"
+           _glibtoolize="`$tool --version > /dev/null 2>&1`"
+           if [ $? = 0 ] ; then
+               $VERBOSE_ECHO "Found $tool --version"
+               _glti="`which $tool`"
+               if [ "x$_glti" = "x" ] ; then
+                   $VERBOSE_ECHO "Cannot find $tool with which"
+                   continue;
+               fi
+               if test ! -f "$_glti" ; then
+                   $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file"
+                   continue;
+               fi
+               _gltidir="`dirname $_glti`"
+               if [ "x$_gltidir" = "x" ] ; then
+                   $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti"
+                   continue;
+               fi
+               if test ! -d "$_gltidir" ; then
+                   $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory"
+                   continue;
+               fi
+               HAVE_ALT_LIBTOOLIZE=yes
+               LIBTOOLIZE="$tool"
+               $ECHO
+               $ECHO "Fortunately, $tool was found which means that your system may simply"
+               $ECHO "have a non-standard or incomplete GNU Autotools install.  If you have"
+               $ECHO "sufficient system access, it may be possible to quell this warning by"
+               $ECHO "running:"
+               $ECHO
+               sudo -V > /dev/null 2>&1
+               if [ $? = 0 ] ; then
+                   $ECHO "   sudo ln -s $_glti $_gltidir/libtoolize"
+                   $ECHO
+               else
+                   $ECHO "   ln -s $_glti $_gltidir/libtoolize"
+                   $ECHO
+                   $ECHO "Run that as root or with proper permissions to the $_gltidir directory"
+                   $ECHO
+               fi
+               _ltfound=yes
+               break
+           fi
+       done
+    else
+       _ltfound=yes
+    fi
+else
+    _ltfound=yes
+    $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE"
+fi
+
+
+############################
+# libtoolize version check #
+############################
+_report_error=no
+if [ ! "x$_ltfound" = "xyes" ] ; then
+    $ECHO
+    $ECHO "ERROR: Unable to locate GNU Libtool."
+    _report_error=yes
+else
+    _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
+    if [ "x$_version" = "x" ] ; then
+       _version="0.0.0"
+    fi
+    $ECHO "Found GNU Libtool version $_version"
+    version_check "$LIBTOOL_VERSION" "$_version"
+    if [ $? -ne 0 ] ; then
+       _report_error=yes
+    fi
+fi
+if [ "x$_report_error" = "xyes" ] ; then
+    version_error "$LIBTOOL_VERSION" "GNU Libtool"
+    exit 1
+fi
+
+
+#####################
+# check for aclocal #
+#####################
+if [ "x$ACLOCAL" = "x" ] ; then
+    for ACLOCAL in aclocal ; do
+       $VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version"
+       $ACLOCAL --version > /dev/null 2>&1
+       if [ $? = 0 ] ; then
+           break
+       fi
+    done
+else
+    $ECHO "Using ACLOCAL environment variable override: $ACLOCAL"
+fi
+
+
+########################
+# check for autoheader #
+########################
+if [ "x$AUTOHEADER" = "x" ] ; then
+    for AUTOHEADER in autoheader ; do
+       $VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version"
+       $AUTOHEADER --version > /dev/null 2>&1
+       if [ $? = 0 ] ; then
+           break
+       fi
+    done
+else
+    $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER"
+fi
+
+
+#########################
+# check if version only #
+#########################
+$VERBOSE_ECHO "Checking whether to only output version information"
+if [ "x$VERSION_ONLY" = "xyes" ] ; then
+    $ECHO
+    ident
+    $ECHO "---"
+    $ECHO "Version requested.  No preparation or configuration will be performed."
+    exit 0
+fi
+
+
+#################################
+# PROTECT_FROM_CLOBBER FUNCTION #
+#################################
+protect_from_clobber ( ) {
+    PFC_INIT=1
+
+    # protect COPYING & INSTALL from overwrite by automake.  the
+    # automake force option will (inappropriately) ignore the existing
+    # contents of a COPYING and/or INSTALL files (depending on the
+    # version) instead of just forcing *missing* files like it does
+    # for AUTHORS, NEWS, and README. this is broken but extremely
+    # prevalent behavior, so we protect against it by keeping a backup
+    # of the file that can later be restored.
+
+    for file in COPYING INSTALL ; do
+       if test -f ${file} ; then
+           if test -f ${file}.$$.protect_from_automake.backup ; then
+               $VERBOSE_ECHO "Already backed up ${file} in `pwd`"
+           else
+               $VERBOSE_ECHO "Backing up ${file} in `pwd`"
+               $VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup"
+               cp -p ${file} ${file}.$$.protect_from_automake.backup
+           fi
+       fi
+    done
+}
+
+
+##############################
+# RECURSIVE_PROTECT FUNCTION #
+##############################
+recursive_protect ( ) {
+
+    # for projects using recursive configure, run the build
+    # preparation steps for the subdirectories.  this function assumes
+    # START_PATH was set to pwd before recursion begins so that
+    # relative paths work.
+
+    # git 'r done, protect COPYING and INSTALL from being clobbered
+    protect_from_clobber
+
+    if test -d autom4te.cache ; then
+       $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
+       $VERBOSE_ECHO "rm -rf autom4te.cache"
+       rm -rf autom4te.cache
+    fi
+
+    # find configure template
+    _configure="`locate_configure_template`"
+    if [ "x$_configure" = "x" ] ; then
+       return
+    fi
+    # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure"
+
+    # look for subdirs
+    # $VERBOSE_ECHO "Looking for subdirs in `pwd`"
+    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[    ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+    CHECK_DIRS=""
+    for dir in $_det_config_subdirs ; do
+       if test -d "`pwd`/$dir" ; then
+           CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\""
+       fi
+    done
+
+    # process subdirs
+    if [ ! "x$CHECK_DIRS" = "x" ] ; then
+       $VERBOSE_ECHO "Recursively scanning the following directories:"
+       $VERBOSE_ECHO "  $CHECK_DIRS"
+       for dir in $CHECK_DIRS ; do
+           $VERBOSE_ECHO "Protecting files from automake in $dir"
+           cd "$START_PATH"
+           eval "cd $dir"
+
+           # recursively git 'r done
+           recursive_protect
+       done
+    fi
+} # end of recursive_protect
+
+
+#############################
+# RESTORE_CLOBBERED FUNCION #
+#############################
+restore_clobbered ( ) {
+
+    # The automake (and autoreconf by extension) -f/--force-missing
+    # option may overwrite COPYING and INSTALL even if they do exist.
+    # Here we restore the files if necessary.
+
+    spacer=no
+
+    for file in COPYING INSTALL ; do
+       if test -f ${file}.$$.protect_from_automake.backup ; then
+           if test -f ${file} ; then
+           # compare entire content, restore if needed
+           if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then
+               if test "x$spacer" = "xno" ; then
+                   $VERBOSE_ECHO
+                   spacer=yes
+               fi
+               # restore the backup
+               $VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)"
+               $VERBOSE_ECHO "rm -f ${file}"
+               rm -f ${file}
+               $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}"
+               mv ${file}.$$.protect_from_automake.backup ${file}
+           fi # check contents
+           elif test -f ${file}.$$.protect_from_automake.backup ; then
+               $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}"
+               mv ${file}.$$.protect_from_automake.backup ${file}
+           fi # -f ${file}
+       
+           # just in case
+           $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup"
+           rm -f ${file}.$$.protect_from_automake.backup
+       fi # -f ${file}.$$.protect_from_automake.backup
+    done
+
+    CONFIGURE="`locate_configure_template`"
+    if [ "x$CONFIGURE" = "x" ] ; then
+       return
+    fi
+
+    _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[     ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+    if test ! -d "$_aux_dir" ; then
+       _aux_dir=.
+    fi
+
+    for file in config.guess config.sub ltmain.sh ; do
+       if test -f "${_aux_dir}/${file}" ; then
+           $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\""
+           rm -f "${_aux_dir}/${file}.backup"
+       fi
+    done
+} # end of restore_clobbered
+
+
+##############################
+# RECURSIVE_RESTORE FUNCTION #
+##############################
+recursive_restore ( ) {
+
+    # restore COPYING and INSTALL from backup if they were clobbered
+    # for each directory recursively.
+
+    # git 'r undone
+    restore_clobbered
+
+    # find configure template
+    _configure="`locate_configure_template`"
+    if [ "x$_configure" = "x" ] ; then
+       return
+    fi
+
+    # look for subdirs
+    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[    ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+    CHECK_DIRS=""
+    for dir in $_det_config_subdirs ; do
+       if test -d "`pwd`/$dir" ; then
+           CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\""
+       fi
+    done
+
+    # process subdirs
+    if [ ! "x$CHECK_DIRS" = "x" ] ; then
+       $VERBOSE_ECHO "Recursively scanning the following directories:"
+       $VERBOSE_ECHO "  $CHECK_DIRS"
+       for dir in $CHECK_DIRS ; do
+           $VERBOSE_ECHO "Checking files for automake damage in $dir"
+           cd "$START_PATH"
+           eval "cd $dir"
+
+           # recursively git 'r undone
+           recursive_restore
+       done
+    fi
+} # end of recursive_restore
+
+
+#######################
+# INITIALIZE FUNCTION #
+#######################
+initialize ( ) {
+
+    # this routine performs a variety of directory-specific
+    # initializations.  some are sanity checks, some are preventive,
+    # and some are necessary setup detection.
+    #
+    # this function sets:
+    #   CONFIGURE
+    #   SEARCH_DIRS
+    #   CONFIG_SUBDIRS
+
+    ##################################
+    # check for a configure template #
+    ##################################
+    CONFIGURE="`locate_configure_template`"
+    if [ "x$CONFIGURE" = "x" ] ; then
+       $ECHO
+       $ECHO "A configure.ac or configure.in file could not be located implying"
+       $ECHO "that the GNU Build System is at least not used in this directory.  In"
+       $ECHO "any case, there is nothing to do here without one of those files."
+       $ECHO
+       $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`"
+       exit 1
+    fi
+
+    #####################
+    # detect an aux dir #
+    #####################
+    _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[     ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+    if test ! -d "$_aux_dir" ; then
+       _aux_dir=.
+    else
+       $VERBOSE_ECHO "Detected auxillary directory: $_aux_dir"
+    fi
+
+    ################################
+    # detect a recursive configure #
+    ################################
+    CONFIG_SUBDIRS=""
+    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[     ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+    for dir in $_det_config_subdirs ; do
+       if test -d "`pwd`/$dir" ; then
+           $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir"
+           CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir"
+       fi
+    done
+
+    ###########################################################
+    # make sure certain required files exist for GNU projects #
+    ###########################################################
+    _marker_found=""
+    _marker_found_message_intro='Detected non-GNU marker "'
+    _marker_found_message_mid='" in '
+    for marker in foreign cygnus ; do
+       _marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid}
+       _marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`"
+       if [ ! "x$_marker_found" = "x" ] ; then
+           $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`"
+           break
+       fi
+       if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then
+           _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`"
+           if [ ! "x$_marker_found" = "x" ] ; then
+               $VERBOSE_ECHO "${_marker_found_message}Makefile.am"
+               break
+           fi
+       fi
+    done
+    if [ "x${_marker_found}" = "x" ] ; then
+       _suggest_foreign=no
+       for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do
+           if [ ! -f $file ] ; then
+               $VERBOSE_ECHO "Touching ${file} since it does not exist"
+               _suggest_foreign=yes
+               touch $file
+           fi
+       done
+
+       if [ "x${_suggest_foreign}" = "xyes" ] ; then
+           $ECHO
+           $ECHO "Warning: Several files expected of projects that conform to the GNU"
+           $ECHO "coding standards were not found.  The files were automatically added"
+           $ECHO "for you since you do not have a 'foreign' declaration specified."
+           $ECHO
+           $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`"
+           if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then
+               $ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file."
+           fi
+           $ECHO
+       fi
+    fi
+
+    ##################################################
+    # make sure certain generated files do not exist #
+    ##################################################
+    for file in config.guess config.sub ltmain.sh ; do
+       if test -f "${_aux_dir}/${file}" ; then
+           $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\""
+           mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup"
+       fi
+    done
+
+    ############################
+    # search alternate m4 dirs #
+    ############################
+    SEARCH_DIRS=""
+    for dir in m4 ; do
+       if [ -d $dir ] ; then
+           $VERBOSE_ECHO "Found extra aclocal search directory: $dir"
+           SEARCH_DIRS="$SEARCH_DIRS -I $dir"
+       fi
+    done
+
+    ######################################
+    # remove any previous build products #
+    ######################################
+    if test -d autom4te.cache ; then
+       $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
+       $VERBOSE_ECHO "rm -rf autom4te.cache"
+       rm -rf autom4te.cache
+    fi
+# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it
+#     if test -f aclocal.m4 ; then
+#      $VERBOSE_ECHO "Found an aclocal.m4 file, deleting it"
+#      $VERBOSE_ECHO "rm -f aclocal.m4"
+#      rm -f aclocal.m4
+#     fi
+
+} # end of initialize()
+
+
+##############
+# initialize #
+##############
+
+# stash path
+START_PATH="`pwd`"
+
+# Before running autoreconf or manual steps, some prep detection work
+# is necessary or useful.  Only needs to occur once per directory, but
+# does need to traverse the entire subconfigure hierarchy to protect
+# files from being clobbered even by autoreconf.
+recursive_protect
+
+# start from where we started
+cd "$START_PATH"
+
+# get ready to process
+initialize
+
+
+#########################################
+# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION #
+#########################################
+
+# TODO - should make sure wget/curl exist and/or work before trying to
+# use them.
+
+download_gnulib_config_guess () {
+    # abuse gitweb to download gnulib's latest config.guess via HTTP
+    config_guess_temp="config.guess.$$.download"
+    ret=1
+    for __cmd in wget curl fetch ; do
+       $VERBOSE_ECHO "Checking for command ${__cmd}"
+       ${__cmd} --version > /dev/null 2>&1
+       ret=$?
+       if [ ! $ret = 0 ] ; then
+           continue
+        fi
+
+       __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'`
+       $VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}"
+
+       opts=""
+       case ${__cmd} in
+           wget)
+               opts="-O" 
+               ;;
+           curl)
+               opts="-o"
+               ;;
+           fetch)
+               opts="-t 5 -f"
+               ;;
+       esac
+
+       $VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\""
+       eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1
+       if [ $? = 0 ] ; then
+           mv -f "${config_guess_temp}" ${_aux_dir}/config.guess
+           ret=0
+           break
+       fi
+    done
+
+    if [ ! $ret = 0 ] ; then
+       $ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL"
+       rm -f "${config_guess_temp}"
+    fi
+}
+
+
+##############################
+# LIBTOOLIZE_NEEDED FUNCTION #
+##############################
+libtoolize_needed () {
+    ret=1 # means no, don't need libtoolize
+    for feature in AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT ; do
+       $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
+       found="`grep \"^$feature.*\" $CONFIGURE`"
+       if [ ! "x$found" = "x" ] ; then
+           ret=0 # means yes, need to run libtoolize
+           break
+       fi
+    done
+    return ${ret}
+}
+
+
+
+############################################
+# prepare build via autoreconf or manually #
+############################################
+reconfigure_manually=no
+if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then
+    $ECHO
+    $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C"
+
+    $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS"
+    autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`"
+    ret=$?
+    $VERBOSE_ECHO "$autoreconf_output"
+
+    if [ ! $ret = 0 ] ; then
+       if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
+           if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then
+               $ECHO
+               $ECHO "Warning: autoreconf failed but due to what is usually a common libtool"
+               $ECHO "misconfiguration issue.  This problem is encountered on systems that"
+               $ECHO "have installed libtoolize under a different name without providing a"
+               $ECHO "symbolic link or without setting the LIBTOOLIZE environment variable."
+               $ECHO
+               $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE"
+
+               export LIBTOOLIZE
+               RUN_RECURSIVE=no
+               export RUN_RECURSIVE
+               untrap_abnormal
+
+               $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+               sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+               exit $?
+           fi
+       fi
+
+       $ECHO "Warning: $AUTORECONF failed"
+
+       if test -f ltmain.sh ; then
+           $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should"
+       fi
+
+       $ECHO "Attempting to run the preparation steps individually"
+       reconfigure_manually=yes
+    else
+       if [ "x$DOWNLOAD" = "xyes" ] ; then
+           if libtoolize_needed ; then
+               download_gnulib_config_guess
+           fi
+       fi
+    fi
+else
+    reconfigure_manually=yes
+fi
+
+
+############################
+# LIBTOOL_FAILURE FUNCTION #
+############################
+libtool_failure ( ) {
+
+    # libtool is rather error-prone in comparison to the other
+    # autotools and this routine attempts to compensate for some
+    # common failures.  the output after a libtoolize failure is
+    # parsed for an error related to AC_PROG_LIBTOOL and if found, we
+    # attempt to inject a project-provided libtool.m4 file.
+
+    _autoconf_output="$1"
+
+    if [ "x$RUN_RECURSIVE" = "xno" ] ; then
+       # we already tried the libtool.m4, don't try again
+       return 1
+    fi
+
+    if test -f "$LIBTOOL_M4" ; then
+       found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`"
+       if test ! "x$found_libtool" = "x" ; then
+           if test -f acinclude.m4 ; then
+               rm -f acinclude.m4.$$.backup
+               $VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup"
+               cat acinclude.m4 > acinclude.m4.$$.backup
+           fi
+           $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4"
+           chmod u+w acinclude.m4
+           cat "$LIBTOOL_M4" >> acinclude.m4
+
+           # don't keep doing this
+           RUN_RECURSIVE=no
+           export RUN_RECURSIVE
+           untrap_abnormal
+
+           $ECHO
+           $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4"
+           $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+           sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+           exit $?
+       fi
+    fi
+}
+
+
+###########################
+# MANUAL_AUTOGEN FUNCTION #
+###########################
+manual_autogen ( ) {
+
+    ##################################################
+    # Manual preparation steps taken are as follows: #
+    #   aclocal [-I m4]                              #
+    #   libtoolize --automake -c -f                  #
+    #   aclocal [-I m4]                              #
+    #   autoconf -f                                  #
+    #   autoheader                                   #
+    #   automake -a -c -f                            #
+    ##################################################
+
+    ###########
+    # aclocal #
+    ###########
+    $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS"
+    aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`"
+    ret=$?
+    $VERBOSE_ECHO "$aclocal_output"
+    if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi
+
+    ##############
+    # libtoolize #
+    ##############
+    if libtoolize_needed ; then
+       if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then
+           $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS"
+           libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`"
+           ret=$?
+           $VERBOSE_ECHO "$libtoolize_output"
+
+           if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
+       else
+           if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
+               $VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS"
+               libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`"
+               ret=$?
+               $VERBOSE_ECHO "$libtoolize_output"
+
+               if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
+           fi
+       fi
+
+       ###########
+       # aclocal #
+       ###########
+       # re-run again as instructed by libtoolize
+       $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS"
+       aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`"
+       ret=$?
+       $VERBOSE_ECHO "$aclocal_output"
+
+       # libtoolize might put ltmain.sh in the wrong place
+       if test -f ltmain.sh ; then
+           if test ! -f "${_aux_dir}/ltmain.sh" ; then
+               $ECHO
+               $ECHO "Warning:  $LIBTOOLIZE is creating ltmain.sh in the wrong directory"
+               $ECHO
+               $ECHO "Fortunately, the problem can be worked around by simply copying the"
+               $ECHO "file to the appropriate location (${_aux_dir}/).  This has been done for you."
+               $ECHO
+               $VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\""
+               cp -p ltmain.sh "${_aux_dir}/ltmain.sh"
+               $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
+           fi
+       fi # ltmain.sh
+
+       if [ "x$DOWNLOAD" = "xyes" ] ; then
+           download_gnulib_config_guess
+       fi
+    fi # libtoolize_needed
+
+    ############
+    # autoconf #
+    ############
+    $VERBOSE_ECHO
+    $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS"
+    autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`"
+    ret=$?
+    $VERBOSE_ECHO "$autoconf_output"
+
+    if [ ! $ret = 0 ] ; then
+       # retry without the -f and check for usage of macros that are too new
+       ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE"
+       ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE"
+       ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T"
+
+       macros_to_search=""
+       ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`"
+       ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`"
+
+       if [ $ac_major -lt 2 ] ; then
+           macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
+       else
+           if [ $ac_minor -lt 54 ] ; then
+               macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
+           elif [ $ac_minor -lt 55 ] ; then
+               macros_to_search="$ac2_59_macros $ac2_55_macros"
+           elif [ $ac_minor -lt 59 ] ; then
+               macros_to_search="$ac2_59_macros"
+           fi
+       fi
+
+       configure_ac_macros=__none__
+       for feature in $macros_to_search ; do
+           $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
+           found="`grep \"^$feature.*\" $CONFIGURE`"
+           if [ ! "x$found" = "x" ] ; then
+               if [ "x$configure_ac_macros" = "x__none__" ] ; then
+                   configure_ac_macros="$feature"
+               else
+                   configure_ac_macros="$feature $configure_ac_macros"
+               fi
+           fi
+       done
+       if [ ! "x$configure_ac_macros" = "x__none__" ] ; then
+           $ECHO
+           $ECHO "Warning:  Unsupported macros were found in $CONFIGURE"
+           $ECHO
+           $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any"
+           $ECHO "unsupported macros are used that exceed the minimum version"
+           $ECHO "settings specified within this file.  As such, the following macros"
+           $ECHO "should be removed from configure.ac or the version numbers in this"
+           $ECHO "file should be increased:"
+           $ECHO
+           $ECHO "$configure_ac_macros"
+           $ECHO
+           $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C"
+       fi
+
+       ###################
+       # autoconf, retry #
+       ###################
+       $VERBOSE_ECHO
+       $VERBOSE_ECHO "$AUTOCONF"
+       autoconf_output="`$AUTOCONF 2>&1`"
+       ret=$?
+       $VERBOSE_ECHO "$autoconf_output"
+
+       if [ ! $ret = 0 ] ; then
+           # test if libtool is busted
+           libtool_failure "$autoconf_output"
+
+           # let the user know what went wrong
+           cat <<EOF
+$autoconf_output
+EOF
+           $ECHO "ERROR: $AUTOCONF failed"
+           exit 2
+       else
+           # autoconf sans -f and possibly sans unsupported options succeed so warn verbosely
+           $ECHO
+           $ECHO "Warning: autoconf seems to have succeeded by removing the following options:"
+           $ECHO "     AUTOCONF_OPTIONS=\"$AUTOCONF_OPTIONS\""
+           $ECHO
+           $ECHO "Removing those options should not be necessary and indicate some other"
+           $ECHO "problem with the build system.  The build preparation is highly suspect"
+           $ECHO "and may result in configuration or compilation errors.  Consider"
+           if [ "x$VERBOSE_ECHO" = "x:" ] ; then
+               $ECHO "rerunning the build preparation with verbose output enabled."
+               $ECHO " $AUTOGEN_SH --verbose"
+           else
+               $ECHO "reviewing the minimum GNU Autotools version settings contained in"
+               $ECHO "this script along with the macros being used in your `basename \"$CONFIGURE\"` file."
+           fi
+           $ECHO
+           $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
+       fi # autoconf ret = 0
+    fi # autoconf ret = 0
+
+    ##############
+    # autoheader #
+    ##############
+    need_autoheader=no
+    for feature in AM_CONFIG_HEADER AC_CONFIG_HEADER ; do
+       $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
+       found="`grep \"^$feature.*\" $CONFIGURE`"
+       if [ ! "x$found" = "x" ] ; then
+           need_autoheader=yes
+           break
+       fi
+    done
+    if [ "x$need_autoheader" = "xyes" ] ; then
+       $VERBOSE_ECHO "$AUTOHEADER $AUTOHEADER_OPTIONS"
+       autoheader_output="`$AUTOHEADER $AUTOHEADER_OPTIONS 2>&1`"
+       ret=$?
+       $VERBOSE_ECHO "$autoheader_output"
+       if [ ! $ret = 0 ] ; then $ECHO "ERROR: $AUTOHEADER failed" && exit 2 ; fi
+    fi # need_autoheader
+
+    ############
+    # automake #
+    ############
+    need_automake=no
+    for feature in AM_INIT_AUTOMAKE ; do
+       $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
+       found="`grep \"^$feature.*\" $CONFIGURE`"
+       if [ ! "x$found" = "x" ] ; then
+           need_automake=yes
+           break
+       fi
+    done
+
+    if [ "x$need_automake" = "xyes" ] ; then
+       $VERBOSE_ECHO "$AUTOMAKE $AUTOMAKE_OPTIONS"
+       automake_output="`$AUTOMAKE $AUTOMAKE_OPTIONS 2>&1`"
+       ret=$?
+       $VERBOSE_ECHO "$automake_output"
+
+       if [ ! $ret = 0 ] ; then
+
+           ###################
+           # automake, retry #
+           ###################
+           $VERBOSE_ECHO
+           $VERBOSE_ECHO "$AUTOMAKE $ALT_AUTOMAKE_OPTIONS"
+           # retry without the -f
+           automake_output="`$AUTOMAKE $ALT_AUTOMAKE_OPTIONS 2>&1`"
+           ret=$?
+           $VERBOSE_ECHO "$automake_output"
+
+           if [ ! $ret = 0 ] ; then
+               # test if libtool is busted
+               libtool_failure "$automake_output"
+
+               # let the user know what went wrong
+               cat <<EOF
+$automake_output
+EOF
+               $ECHO "ERROR: $AUTOMAKE failed"
+               exit 2
+           fi # automake retry
+       fi # automake ret = 0
+    fi # need_automake
+} # end of manual_autogen
+
+
+#####################################
+# RECURSIVE_MANUAL_AUTOGEN FUNCTION #
+#####################################
+recursive_manual_autogen ( ) {
+
+    # run the build preparation steps manually for this directory
+    manual_autogen
+
+    # for projects using recursive configure, run the build
+    # preparation steps for the subdirectories.
+    if [ ! "x$CONFIG_SUBDIRS" = "x" ] ; then
+       $VERBOSE_ECHO "Recursively configuring the following directories:"
+       $VERBOSE_ECHO "  $CONFIG_SUBDIRS"
+       for dir in $CONFIG_SUBDIRS ; do
+           $VERBOSE_ECHO "Processing recursive configure in $dir"
+           cd "$START_PATH"
+           cd "$dir"
+
+           # new directory, prepare
+           initialize
+
+           # run manual steps for the subdir and any others below
+           recursive_manual_autogen
+       done
+    fi
+}
+
+
+################################
+# run manual preparation steps #
+################################
+if [ "x$reconfigure_manually" = "xyes" ] ; then
+    $ECHO
+    $ECHO $ECHO_N "Preparing build ... $ECHO_C"
+
+    recursive_manual_autogen
+fi
+
+
+#########################
+# restore and summarize #
+#########################
+cd "$START_PATH"
+
+# restore COPYING and INSTALL from backup if necessary
+recursive_restore
+
+# make sure we end up with a configure script
+config_ac="`locate_configure_template`"
+config="`echo $config_ac | sed 's/\.ac$//' | sed 's/\.in$//'`"
+if [ "x$config" = "x" ] ; then
+    $VERBOSE_ECHO "Could not locate the configure template (from `pwd`)"
+fi
+
+# summarize
+$ECHO "done"
+$ECHO
+if test "x$config" = "x" -o ! -f "$config" ; then
+    $ECHO "WARNING: The $PROJECT build system should now be prepared but there"
+    $ECHO "does not seem to be a resulting configure file.  This is unexpected"
+    $ECHO "and likely the result of an error.  You should run $NAME_OF_AUTOGEN"
+    $ECHO "with the --verbose option to get more details on a potential"
+    $ECHO "misconfiguration."
+else
+    $ECHO "The $PROJECT build system is now prepared.  To build here, run:"
+    $ECHO "  $config"
+    $ECHO "  make"
+fi
+
+
+# Local Variables:
+# mode: sh
+# tab-width: 8
+# sh-basic-offset: 4
+# sh-indentation: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8
diff --git a/changelog b/changelog
new file mode 100644 (file)
index 0000000..f0278dc
--- /dev/null
+++ b/changelog
@@ -0,0 +1,401 @@
+Changelog
+---------
+
+(development since 1.22)
+
+User api additions
+------------------
+
+ - You can now call libwebsocket_callback_on_writable() on http connectons,
+       and get a LWS_CALLBACK_HTTP_WRITEABLE callback, the same way you can
+       regulate writes with a websocket protocol connection.
+
+ - A new member in the context creation parameter struct "ssl_cipher_list" is
+       added, replacing CIPHERS_LIST_STRING.  NULL means use the ssl library
+       default list of ciphers.
+
+User api changes
+----------------
+
+ - the external poll callbacks now get the socket descriptor coming from the
+       "in" parameter.  The user parameter provides the user_space for the
+       wsi as it normally does on the other callbacks.
+       LWS_CALLBACK_FILTER_NETWORK_CONNECTION also has the socket descriptor
+       delivered by @in now instead of @user.
+
+ - libwebsocket_write() now returns -1 for error, or the amount of data
+       actually accepted for send.  Under load, the OS may signal it is
+       ready to send new data on the socket, but have only a restricted
+       amount of memory to buffer the packet compared to usual.
+
+
+User api removal
+----------------
+
+ - libwebsocket_ensure_user_space() is removed from the public api, if you
+       were using it to get user_space, you need to adapt your code to only
+       use user_space inside the user callback.
+
+ - CIPHERS_LIST_STRING is removed
+
+
+v1.21-chrome26-firefox18
+========================
+
+ - Fixes buffer overflow bug in max frame size handling if you used the
+       default protocol buffer size.  If you declared rx_buffer_size in your
+       protocol, which is recommended anyway, your code was unaffected.
+
+v1.2-chrome26-firefox18
+=======================
+
+Diffstat
+--------
+
+ .gitignore                                                      |  16 +++
+ CMakeLists.txt                                                  | 544 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ LICENSE                                                         | 526 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ Makefile.am                                                     |   1 +
+ README                                                          |  20 +++
+ README.build                                                    | 258 ++++++++++++++++++++++++++++++++-----
+ README.coding                                                   |  52 ++++++++
+ changelog                                                       | 136 ++++++++++++++++++++
+ cmake/FindOpenSSLbins.cmake                                     |  33 +++++
+ config.h.cmake                                                  | 173 +++++++++++++++++++++++++
+ configure.ac                                                    |  22 +++-
+ lib/Makefile.am                                                 |  20 ++-
+ lib/base64-decode.c                                             |   2 +-
+ lib/client-handshake.c                                          | 190 +++++++++++-----------------
+ lib/client-parser.c                                             |  88 +++++++------
+ lib/client.c                                                    | 384 ++++++++++++++++++++++++++++++-------------------------
+ lib/daemonize.c                                                 |  32 +++--
+ lib/extension-deflate-frame.c                                   |  58 +++++----
+ lib/extension-deflate-stream.c                                  |  19 ++-
+ lib/extension-deflate-stream.h                                  |   4 +-
+ lib/extension.c                                                 |  11 +-
+ lib/getifaddrs.c                                                | 315 +++++++++++++++++++++++-----------------------
+ lib/getifaddrs.h                                                |  30 ++---
+ lib/handshake.c                                                 | 124 +++++++++++-------
+ lib/libwebsockets.c                                             | 736 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
+ lib/libwebsockets.h                                             | 237 ++++++++++++++++++++++------------
+ lib/output.c                                                    | 192 +++++++++++-----------------
+ lib/parsers.c                                                   | 966 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
+ lib/private-libwebsockets.h                                     | 225 +++++++++++++++++++++------------
+ lib/server-handshake.c                                          |  82 ++++++------
+ lib/server.c                                                    |  96 +++++++-------
+ libwebsockets-api-doc.html                                      | 189 ++++++++++++++++++----------
+ libwebsockets.spec                                              |  17 +--
+ test-server/attack.sh                                           | 148 ++++++++++++++++++++++
+ test-server/test-client.c                                       | 125 +++++++++---------
+ test-server/test-echo.c                                         |  31 +++--
+ test-server/test-fraggle.c                                      |  32 ++---
+ test-server/test-ping.c                                         |  52 ++++----
+ test-server/test-server.c                                       | 129 ++++++++++++-------
+ win32port/libwebsocketswin32/libwebsocketswin32.vcxproj         | 279 ----------------------------------------
+ win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters |  23 +++-
+ 41 files changed, 4398 insertions(+), 2219 deletions(-)
+
+
+User api additions
+------------------
+
+ - lws_get_library_version() returns a const char * with a string like
+        "1.1 9e7f737", representing the library version from configure.ac
+        and the git HEAD hash the library was built from
+
+ - TCP Keepalive can now optionally be applied to all lws sockets, on Linux
+       also with controllable timeout, number of probes and probe interval.
+       (On BSD type OS, you can only use system default settings for the
+       timing and retries, although enabling it is supported by setting
+       ka_time to nonzero, the exact value has no meaning.)
+       This enables detection of idle connections which are logically okay,
+       but are in fact dead, due to network connectivity issues at the server,
+       client, or any intermediary.  By default it's not enabled, but you
+       can enable it by setting a non-zero timeout (in seconds) at the new
+       ka_time member at context creation time.
+
+ - Two new optional user callbacks added, LWS_CALLBACK_PROTOCOL_DESTROY which
+       is called one-time per protocol as the context is being destroyed, and
+       LWS_CALLBACK_PROTOCOL_INIT which is called when the context is created
+       and the protocols are added, again it's a one-time affair.
+       This lets you manage per-protocol allocations properly including
+       cleaning up after yourself when the server goes down.
+
+User api changes
+----------------
+
+ - libwebsocket_create_context() has changed from taking a ton of parameters
+       to just taking a pointer to a struct containing the parameters.  The
+       struct lws_context_creation_info is in libwebsockets.h, the members
+       are in the same order as when they were parameters to the call
+       previously.  The test apps are all updated accordingly so you can
+       see example code there.
+
+ - Header tokens are now deleted after the websocket connection is
+       established.  Not just the header data is saved, but the pointer and
+       length array is also removed from (union) scope saving several hundred
+       bytes per connection once it is established
+
+ - struct libwebsocket_protocols has a new member rx_buffer_size, this
+       controls rx buffer size per connection of that protocol now.  Sources
+       for apps built against older versions of the library won't declare
+       this in their protocols, defaulting it to 0.  Zero buffer is legal,
+       it causes a default buffer to be allocated (currently 4096)
+
+       If you want to receive only atomic frames in your user callback, you
+       should set this to greater than your largest frame size.  If a frame
+       comes that exceeds that, no error occurs but the callback happens as
+       soon as the buffer limit is reached, and again if it is reached again
+       or the frame completes.  You can detect that has happened by seeing
+       there is still frame content pending using
+       libwebsockets_remaining_packet_payload()
+
+       By correctly setting this, you can save a lot of memory when your
+       protocol has small frames (see the test server and client sources).
+
+ - LWS_MAX_HEADER_LEN now defaults to 1024 and is the total amount of known
+       header payload lws can cope with, that includes the GET URL, origin
+       etc.  Headers not understood by lws are ignored and their payload
+       not included in this.
+
+
+User api removals
+-----------------
+
+ - The configuration-time option MAX_USER_RX_BUFFER has been replaced by a
+       buffer size chosen per-protocol.  For compatibility, there's a default
+       of 4096 rx buffer, but user code should set the appropriate size for
+       the protocol frames.
+
+ - LWS_INITIAL_HDR_ALLOC and LWS_ADDITIONAL_HDR_ALLOC are no longer needed
+       and have been removed.  There's a new header management scheme that
+       handles them in a much more compact way.
+
+ - libwebsockets_hangup_on_client() is removed.  If you want to close the
+       connection you must do so from the user callback and by returning
+       -1 from there.
+
+ - libwebsocket_close_and_free_session() is now private to the library code
+       only and not exposed for user code.  If you want to close the
+       connection, you must do so from the user callback by returning -1
+       from there.
+
+
+New features
+------------
+
+ - Cmake project file added, aimed initially at Windows support: this replaces
+       the visual studio project files that were in the tree until now.
+
+ - CyaSSL now supported in place of OpenSSL (--use-cyassl on configure)
+
+ - PATH_MAX or MAX_PATH no longer needed
+
+ - cutomizable frame rx buffer size by protocol
+
+ - optional TCP keepalive so dead peers can be detected, can be enabled at
+       context-creation time
+
+ - valgrind-clean: no SSL or CyaSSL: completely clean.  With OpenSSL, 88 bytes
+       lost at OpenSSL library init and symptomless reports of uninitialized
+       memory usage... seems to be a known and ignored problem at OpenSSL
+
+ - By default debug is enabled and the library is built for -O0 -g to faclitate
+       that.  Use --disable-debug configure option to build instead with -O4
+       and no -g (debug info), obviously providing best performance and
+       reduced binary size.
+
+ - 1.0 introduced some code to try to not deflate small frames, however this
+       seems to break when confronted with a mixture of frames above and
+       below the threshold, so it's removed.  Veto the compression extension
+       in your user callback if you will typically have very small frames.
+
+ - There are many memory usage improvements, both a reduction in malloc/
+       realloc and architectural changes.  A websocket connection now
+       consumes only 296 bytes with SSL or 272 bytes without on x86_64,
+       during header processing an additional 1262 bytes is allocated in a
+       single malloc, but is freed when the websocket connection starts.
+       The RX frame buffer defined by the protocol in user
+       code is also allocated per connection, this represents the largest
+       frame you can receive atomically in that protocol.
+
+ - On ARM9 build, just http+ws server no extensions or ssl, <12Kbytes .text
+       and 112 bytes per connection (+1328 only during header processing)
+
+
+v1.1-chrome26-firefox18
+=======================
+
+Diffstat
+--------
+
+ Makefile.am                            |    4 +
+ README-test-server                     |  291 ---
+ README.build                           |  239 ++
+ README.coding                          |  138 ++
+ README.rst                             |   72 -
+ README.test-apps                       |  272 +++
+ configure.ac                           |  116 +-
+ lib/Makefile.am                        |   55 +-
+ lib/base64-decode.c                    |    5 +-
+ lib/client-handshake.c                 |  121 +-
+ lib/client-parser.c                    |  394 ++++
+ lib/client.c                           |  807 +++++++
+ lib/daemonize.c                        |  212 ++
+ lib/extension-deflate-frame.c          |  132 +-
+ lib/extension-deflate-stream.c         |   12 +-
+ lib/extension-x-google-mux.c           | 1223 ----------
+ lib/extension-x-google-mux.h           |   96 -
+ lib/extension.c                        |    8 -
+ lib/getifaddrs.c                       |  271 +++
+ lib/getifaddrs.h                       |   76 +
+ lib/handshake.c                        |  582 +----
+ lib/libwebsockets.c                    | 2493 ++++++---------------
+ lib/libwebsockets.h                    |  115 +-
+ lib/md5.c                              |  217 --
+ lib/minilex.c                          |  440 ++++
+ lib/output.c                           |  628 ++++++
+ lib/parsers.c                          | 2016 +++++------------
+ lib/private-libwebsockets.h            |  284 +--
+ lib/server-handshake.c                 |  275 +++
+ lib/server.c                           |  377 ++++
+ libwebsockets-api-doc.html             |  300 +--
+ m4/ignore-me                           |    2 +
+ test-server/Makefile.am                |  111 +-
+ test-server/libwebsockets.org-logo.png |  Bin 0 -> 7029 bytes
+ test-server/test-client.c              |   45 +-
+ test-server/test-echo.c                |  330 +++
+ test-server/test-fraggle.c             |   20 +-
+ test-server/test-ping.c                |   22 +-
+ test-server/test-server-extpoll.c      |  554 -----
+ test-server/test-server.c              |  349 ++-
+ test-server/test.html                  |    3 +-
+ win32port/zlib/ZLib.vcxproj            |  749 ++++---
+ win32port/zlib/ZLib.vcxproj.filters    |  188 +-
+ win32port/zlib/adler32.c               |  348 ++-
+ win32port/zlib/compress.c              |  160 +-
+ win32port/zlib/crc32.c                 |  867 ++++----
+ win32port/zlib/crc32.h                 |  882 ++++----
+ win32port/zlib/deflate.c               | 3799 +++++++++++++++-----------------
+ win32port/zlib/deflate.h               |  688 +++---
+ win32port/zlib/gzclose.c               |   50 +-
+ win32port/zlib/gzguts.h                |  325 ++-
+ win32port/zlib/gzlib.c                 | 1157 +++++-----
+ win32port/zlib/gzread.c                | 1242 ++++++-----
+ win32port/zlib/gzwrite.c               | 1096 +++++----
+ win32port/zlib/infback.c               | 1272 ++++++-----
+ win32port/zlib/inffast.c               |  680 +++---
+ win32port/zlib/inffast.h               |   22 +-
+ win32port/zlib/inffixed.h              |  188 +-
+ win32port/zlib/inflate.c               | 2976 +++++++++++++------------
+ win32port/zlib/inflate.h               |  244 +-
+ win32port/zlib/inftrees.c              |  636 +++---
+ win32port/zlib/inftrees.h              |  124 +-
+ win32port/zlib/trees.c                 | 2468 +++++++++++----------
+ win32port/zlib/trees.h                 |  256 +--
+ win32port/zlib/uncompr.c               |  118 +-
+ win32port/zlib/zconf.h                 |  934 ++++----
+ win32port/zlib/zlib.h                  | 3357 ++++++++++++++--------------
+ win32port/zlib/zutil.c                 |  642 +++---
+ win32port/zlib/zutil.h                 |  526 ++---
+ 69 files changed, 19556 insertions(+), 20145 deletions(-)
+
+user api changes
+----------------
+
+ - libwebsockets_serve_http_file() now takes a context as first argument
+
+ - libwebsockets_get_peer_addresses() now takes a context and wsi as first
+       two arguments
+
+
+user api additions
+------------------
+
+ - lwsl_...() logging apis, default to stderr but retargetable by user code;
+       may be used also by user code
+
+ - lws_set_log_level() set which logging apis are able to emit (defaults to
+       notice, warn, err severities), optionally set the emit callback
+
+ - lwsl_emit_syslog() helper callback emits to syslog
+
+ - lws_daemonize() helper code that forks the app into a headless daemon
+       properly, maintains a lock file with pid in suitable for sysvinit etc to
+       control lifecycle
+
+ - LWS_CALLBACK_HTTP_FILE_COMPLETION callback added since http file
+       transfer is now asynchronous (see test server code)
+
+ - lws_frame_is_binary() from a wsi pointer, let you know if the received
+       data was sent in BINARY mode
+
+
+user api removals
+-----------------
+
+ - libwebsockets_fork_service_loop() - no longer supported (had intractable problems)
+       arrange your code to act from the user callback instead from same
+       process context as the service loop
+
+ - libwebsockets_broadcast() - use libwebsocket_callback_on_writable[_all_protocol]()
+       instead from same process context as the service loop.  See the test apps
+       for examples.
+
+ - x-google-mux() removed until someone wants it
+
+ - pre -v13 (ancient) protocol support removed
+
+
+New features
+------------
+
+ - echo test server and client compatible with echo.websocket.org added
+
+ - many new configure options (see README.build) to reduce footprint of the
+       library to what you actually need, eg, --without-client and
+       --without-server
+
+ - http + websocket server can build to as little as 12K .text for ARM
+
+ - no more MAX_CLIENTS limitation; adapts to support the max number of fds
+       allowed to the process by ulimit, defaults to 1024 on Fedora and
+       Ubuntu.  Use ulimit to control this without needing to configure
+       the library.  Code here is smaller and faster.
+
+ - adaptive ratio of listen socket to connection socket service allows
+       good behaviour under Apache ab test load.  Tested with thousands
+       of simultaneous connections
+
+ - reduction in per-connection memory footprint by moving to a union to hold
+       mutually-exclusive state for the connection
+
+ - robustness: Out of Memory taken care of for all allocation code now
+
+ - internal getifaddrs option if your toolchain lacks it (some uclibc)
+
+ - configurable memory limit for deflate operations
+
+ - improvements in SSL code nonblocking operation, possible hang solved,
+       some SSL operations broken down into pollable states so there is
+       no library blocking, timeout coverage for SSL_connect
+
+ - extpoll test server merged into single test server source
+
+ - robustness: library should deal with all recoverable socket conditions
+
+ - rx flowcontrol for backpressure notification fixed and implmeneted
+       correctly in the test server
+
+ - optimal lexical parser added for header processing; all headers in a
+       single 276-byte state table
+
+ - latency tracking api added (configure --with-latency)
+
+ - Improved in-tree documentation, REAME.build, README.coding,
+       README.test-apps, changelog
+
+ - Many small fixes
+
+
+v1.0-chrome25-firefox17 (6cd1ea9b005933f)
diff --git a/cmake/FindGit.cmake b/cmake/FindGit.cmake
new file mode 100755 (executable)
index 0000000..65b946c
--- /dev/null
@@ -0,0 +1,163 @@
+################################################################################
+#
+#  Program: 3D Slicer
+#
+#  Copyright (c) Kitware Inc.
+#
+#  See COPYRIGHT.txt
+#  or http://www.slicer.org/copyright/copyright.txt for details.
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+#  This file was originally developed by Jean-Christophe Fillion-Robin, Kitware Inc.
+#  and was partially funded by NIH grant 3P41RR013218-12S1
+#
+#  AG 2013-02-18: I got it from here
+#  https://github.com/Slicer/Slicer/blob/master/CMake/FindGit.cmake
+#  license is BSD
+#
+################################################################################
+
+#
+# The module defines the following variables:
+#   GIT_EXECUTABLE - path to git command line client
+#   GIT_FOUND - true if the command line client was found
+#
+# If the command line client executable is found the macro
+#  GIT_WC_INFO(<dir> <var-prefix>)
+# is defined to extract information of a git working copy at
+# a given location.
+#
+# The macro defines the following variables:
+#  <var-prefix>_WC_REVISION_HASH - Current SHA1 hash
+#  <var-prefix>_WC_REVISION - Current SHA1 hash
+#  <var-prefix>_WC_REVISION_NAME - Name associated with <var-prefix>_WC_REVISION_HASH
+#  <var-prefix>_WC_URL - output of command `git config --get remote.origin.url'
+#  <var-prefix>_WC_ROOT - Same value as working copy URL
+#  <var-prefix>_WC_GITSVN - Set to false
+#
+# ... and also the following ones if it's a git-svn repository:
+#  <var-prefix>_WC_GITSVN - Set to True if it is a
+#  <var-prefix>_WC_INFO - output of command `git svn info'
+#  <var-prefix>_WC_URL - url of the associated SVN repository
+#  <var-prefix>_WC_ROOT - root url of the associated SVN repository
+#  <var-prefix>_WC_REVISION - current SVN revision number
+#  <var-prefix>_WC_LAST_CHANGED_AUTHOR - author of last commit
+#  <var-prefix>_WC_LAST_CHANGED_DATE - date of last commit
+#  <var-prefix>_WC_LAST_CHANGED_REV - revision of last commit
+#  <var-prefix>_WC_LAST_CHANGED_LOG - last log of base revision
+#
+# Example usage:
+#   find_package(Git)
+#   if(GIT_FOUND)
+#    GIT_WC_INFO(${PROJECT_SOURCE_DIR} Project)
+#    message("Current revision is ${Project_WC_REVISION_HASH}")
+#    message("git found: ${GIT_EXECUTABLE}")
+#   endif()
+#
+
+# Look for 'git' or 'eg' (easy git)
+#
+set(git_names git eg)
+
+# Prefer .cmd variants on Windows unless running in a Makefile
+# in the MSYS shell.
+#
+if(WIN32)
+  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
+    # Note: Due to a bug in 'git.cmd' preventing it from returning the exit code of 'git',
+    #       we excluded it from the list of executables to search.
+    # See http://code.google.com/p/msysgit/issues/detail?id=428
+    # TODO Check if 'git' exists, get the associated version, if the corresponding version
+    #      is known to have a working version of 'git.cmd', use it.
+    set(git_names git eg.cmd eg)
+  endif()
+endif()
+
+find_program(GIT_EXECUTABLE ${git_names}
+  PATHS
+    "C:/Program Files/Git/bin"
+    "C:/Program Files (x86)/Git/bin"
+  DOC "git command line client")
+mark_as_advanced(GIT_EXECUTABLE)
+
+if(GIT_EXECUTABLE)
+  macro(GIT_WC_INFO dir prefix)
+    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=7 HEAD
+       WORKING_DIRECTORY ${dir}
+       ERROR_VARIABLE GIT_error
+       OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH
+       OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set(${prefix}_WC_REVISION ${${prefix}_WC_REVISION_HASH})
+    if(NOT ${GIT_error} EQUAL 0)
+      message(SEND_ERROR "Command \"${GIT_EXECUTBALE} rev-parse --verify -q --short=7 HEAD\" in directory ${dir} failed with output:\n${GIT_error}")
+    else(NOT ${GIT_error} EQUAL 0)
+      execute_process(COMMAND ${GIT_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH}
+         WORKING_DIRECTORY ${dir}
+         OUTPUT_VARIABLE ${prefix}_WC_REVISION_NAME
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif(NOT ${GIT_error} EQUAL 0)
+
+    execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
+       WORKING_DIRECTORY ${dir}
+       OUTPUT_VARIABLE ${prefix}_WC_URL
+       OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    set(${prefix}_WC_GITSVN False)
+
+    # Check if this git is likely to be a git-svn repository
+    execute_process(COMMAND ${GIT_EXECUTABLE} config --get-regexp "^svn-remote"
+      WORKING_DIRECTORY ${dir}
+      OUTPUT_VARIABLE git_config_output
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+
+    if(NOT "${git_config_output}" STREQUAL "")
+      # In case git-svn is used, attempt to extract svn info
+      execute_process(COMMAND ${GIT_EXECUTABLE} svn info
+        WORKING_DIRECTORY ${dir}
+        TIMEOUT 3
+        ERROR_VARIABLE git_svn_info_error
+        OUTPUT_VARIABLE ${prefix}_WC_INFO
+        RESULT_VARIABLE git_svn_info_result
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+      if(${git_svn_info_result} EQUAL 0)
+        set(${prefix}_WC_GITSVN True)
+        string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
+          "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}")
+        string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
+          "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}")
+        string(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*"
+          "\\2" ${prefix}_WC_ROOT "${${prefix}_WC_INFO}")
+        string(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
+          "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}")
+        string(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
+          "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}")
+        string(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
+          "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}")
+      endif(${git_svn_info_result} EQUAL 0)
+    endif(NOT "${git_config_output}" STREQUAL "")
+
+    # If there is no 'remote.origin', default to "NA" value and print a warning message.
+    if(NOT ${prefix}_WC_URL)
+      message(WARNING "No remote origin set for git repository: ${dir}" )
+      set( ${prefix}_WC_URL "NA" )
+    else()
+      set(${prefix}_WC_ROOT ${${prefix}_WC_URL})
+    endif()
+
+  endmacro(GIT_WC_INFO)
+endif(GIT_EXECUTABLE)
+
+# Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if
+# all listed variables are TRUE
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Git DEFAULT_MSG GIT_EXECUTABLE)
+
+
diff --git a/cmake/FindOpenSSLbins.cmake b/cmake/FindOpenSSLbins.cmake
new file mode 100644 (file)
index 0000000..5611c04
--- /dev/null
@@ -0,0 +1,42 @@
+
+if(OPENSSL_FOUND)
+
+       find_program(OPENSSL_EXECUTABLE openssl openssl.exe bin/openssl.exe
+               HINTS ${_OPENSSL_ROOT_HINTS}
+               PATH 
+                       /usr/bin/ 
+                       bin/
+               DOC "Openssl executable")
+
+       mark_as_advanced(OPENSSL_EXECUTABLE)
+       
+       # On Windows, we need to copy the OpenSSL dlls 
+       # to the output directory.
+       if(WIN32)
+               set(OPENSSL_BIN_FOUND 0)
+
+               find_file(LIBEAY_BIN
+                       NAMES
+                       libeay32.dll
+                       HINTS
+                       ${_OPENSSL_ROOT_HINTS}
+                       PATH_SUFFIXES
+                       bin)
+               
+               find_file(SSLEAY_BIN
+                       NAMES
+                       ssleay32.dll
+                       HINTS
+                       ${_OPENSSL_ROOT_HINTS}
+                       PATH_SUFFIXES
+                       bin)
+               
+               if(LIBEAY_BIN)
+                       if(SSLEAY_BIN)
+                               set(OPENSSL_BIN_FOUND 1)
+                       endif(SSLEAY_BIN)
+               endif(LIBEAY_BIN)
+       endif(WIN32)
+               
+endif(OPENSSL_FOUND)
+
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644 (file)
index 0000000..e55d715
--- /dev/null
@@ -0,0 +1,156 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+#ifndef WIN32
+#cmakedefine _DEBUG
+#endif
+
+/* Define to 1 to use CyaSSL as a replacement for OpenSSL. 
+ * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */
+#cmakedefine USE_CYASSL
+
+/* The Libwebsocket version */
+#cmakedefine LWS_LIBRARY_VERSION "${LWS_LIBRARY_VERSION}"
+
+/* The current git commit hash that we're building from */
+#cmakedefine LWS_BUILD_HASH "${LWS_BUILD_HASH}"
+
+/* Build with OpenSSL support */
+#cmakedefine LWS_OPENSSL_SUPPORT
+
+/* Sets the path where the client certs should be installed. */
+#cmakedefine LWS_OPENSSL_CLIENT_CERTS "${LWS_OPENSSL_CLIENT_CERTS}"
+
+/* Turn off websocket extensions */
+#cmakedefine LWS_NO_EXTENSIONS
+
+/* Turn on latency measuring code */
+#cmakedefine LWS_LATENCY
+
+/* Don't build the daemonizeation api */
+#cmakedefine LWS_NO_DAEMONIZE
+
+/* Build without server support */
+#cmakedefine LWS_NO_SERVER
+
+/* Build without client support */
+#cmakedefine LWS_NO_CLIENT
+
+/* If we should compile with MinGW support */
+#cmakedefine LWS_MINGW_SUPPORT
+
+/* Use the BSD getifaddrs that comes with libwebsocket, for uclibc support */
+#cmakedefine LWS_BUILTIN_GETIFADDRS
+
+/* Define to 1 if you have the `bzero' function. */
+#cmakedefine HAVE_BZERO
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#cmakedefine HAVE_DLFCN_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#cmakedefine HAVE_FCNTL_H
+
+/* Define to 1 if you have the `fork' function. */
+#cmakedefine HAVE_FORK
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#cmakedefine HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `ssl' library (-lssl). */
+//#cmakedefine HAVE_LIBSSL
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#cmakedefine HAVE_MALLOC
+
+/* Define to 1 if you have the <memory.h> header file. */
+#cmakedefine HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#cmakedefine HAVE_MEMSET
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#cmakedefine HAVE_NETINET_IN_H
+
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+   and to 0 otherwise. */
+#cmakedefine HAVE_REALLOC
+
+/* Define to 1 if you have the `socket' function. */
+#cmakedefine HAVE_SOCKET
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#cmakedefine HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#cmakedefine HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strerror' function. */
+#cmakedefine HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#cmakedefine HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#cmakedefine HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+#cmakedefine HAVE_SYS_PRCTL_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#cmakedefine HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#cmakedefine HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#cmakedefine HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vfork' function. */
+#cmakedefine HAVE_VFORK
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#cmakedefine HAVE_VFORK_H
+
+/* Define to 1 if `fork' works. */
+#cmakedefine HAVE_WORKING_FORK
+
+/* Define to 1 if `vfork' works. */
+#cmakedefine HAVE_WORKING_VFORK
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#cmakedefine HAVE_ZLIB_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR // We're not using libtool
+
+/* Define to 1 if you have the ANSI C header files. */
+#cmakedefine STDC_HEADERS
+
+/* Version number of package */
+#cmakedefine VERSION
+
+/* Define to rpl_malloc if the replacement function should be used. */
+#cmakedefine malloc
+
+/* Define to `int' if <sys/types.h> does not define. */
+#cmakedefine pid_t
+
+/* Define to rpl_realloc if the replacement function should be used. */
+#cmakedefine realloc
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#cmakedefine size_t
+
+/* Define to 1 if we have getifaddrs */
+#cmakedefine HAVE_GETIFADDRS
+
+/* Define as `fork' if `vfork' does not work. */
+//#cmakedefine vfork
+
+/* Define if the inline keyword doesn't exist. */
+#cmakedefine inline
diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..57866ef
--- /dev/null
@@ -0,0 +1,233 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.61])
+AC_INIT(libwebsockets, 1.2, andy@warmcat.com, libwebsockets, http://libwebsockets.org)
+AC_CONFIG_SRCDIR([test-server/test-server.c])
+AC_CONFIG_HEADERS([config.h])
+
+: ${CFLAGS=""}
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+#AM_PROG_AR
+LT_INIT(shared)
+
+#AX_PTHREAD
+
+# Checks for programs.
+AM_PROG_CC_C_O
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_CONFIG_MACRO_DIR([m4])
+
+PKG_CHECK_MODULES([SD_DAEMON],
+                  [libsystemd-daemon],
+                  [AC_DEFINE([HAVE_SYSTEMD_DAEMON])],
+                 [AC_MSG_NOTICE([Systemd socket activation won't be enabled])])
+AC_SUBST([SD_DAEMON_LIBS])
+AC_SUBST([SD_DAEMON_CFLAGS])
+
+applyhash='CFLAGS+= -DLWS_LIBRARY_VERSION=\"$(PACKAGE_VERSION)\" -DLWS_BUILD_HASH=\"${shell git log -n 1 --pretty=%h}\"'
+AC_SUBST([applyhash])
+AM_SUBST_NOTMAKE([applyhash])
+
+# Check for existance of the inline keyword.
+AC_C_INLINE
+
+#
+#
+#
+AC_ARG_ENABLE(openssl,
+ [  --enable-openssl  Enables https support and needs openssl libs],
+ [ openssl=yes
+ ])
+
+if test "x$openssl" = "xyes" ; then
+AC_CHECK_LIB([ssl], [SSL_library_init])
+CFLAGS="$CFLAGS -DLWS_OPENSSL_SUPPORT"
+fi
+
+#
+#
+#
+AC_ARG_ENABLE(libcrypto,
+ [  --enable-libcrypto  Use libcrypto MD5 and SHA1 implementations],
+ [ libcrypto=yes
+ ])
+
+if test "x$libcrypto" = "xyes" ; then
+CFLAGS="$CFLAGS -DLWS_LIBCRYPTO"
+LDFLAGS="$LDFLAGS -lcrypto"
+fi
+AM_CONDITIONAL(LIBCRYPTO, test x$libcrypto = xyes)
+
+# 
+#
+#
+AC_ARG_WITH(testapps,
+ [  --without-testapps  dont build the libwebsocket-test- apps],
+ [ no_testapps=yes
+ ])
+
+AM_CONDITIONAL(NO_TESTAPPS, test x$no_testapps = xyes)
+
+# 
+#
+#
+AC_ARG_WITH(client,
+ [  --without-client  dont build the client part of the library ],
+ [ no_client=yes
+ ])
+
+if test "x$no_client" = "xyes" ; then                                             
+CFLAGS="$CFLAGS -DLWS_NO_CLIENT"                                          
+fi
+AM_CONDITIONAL(NO_CLIENT, test x$no_client = xyes)
+
+# 
+#
+#
+AC_ARG_WITH(server,
+ [  --without-server  dont build the client part of the library ],
+ [ no_server=yes
+ ])
+
+if test "x$no_server" = "xyes" ; then                                             
+CFLAGS="$CFLAGS -DLWS_NO_SERVER"                                          
+fi
+AM_CONDITIONAL(NO_SERVER, test x$no_server = xyes)
+
+# 
+#
+#
+AC_ARG_WITH(extensions,
+ [  --without-extensions  dont build any stuff related to extensions ],
+ [ no_extensions=yes
+ ])
+
+if test "x$no_extensions" = "xyes" ; then                                             
+CFLAGS="$CFLAGS -DLWS_NO_EXTENSIONS"                                          
+fi
+AM_CONDITIONAL(NO_EXTENSIONS, test x$no_extensions = xyes)
+
+# 
+#
+#
+AC_ARG_WITH(latency,
+ [  --with-latency  Build latency measuring code into the library ],
+ [ latency=yes
+ ])
+
+if test "x$latency" = "xyes" ; then                                             
+CFLAGS="$CFLAGS -DLWS_LATENCY"                                          
+fi
+AM_CONDITIONAL(LATENCY, test x$latency = xyes)
+
+# 
+#
+#
+AC_ARG_WITH(daemonize,
+ [  --without-daemonize  dont build the daemonization api ],
+ [ no_daemonize=yes
+ ])
+
+if test "x$no_daemonize" = "xyes" ; then                                             
+CFLAGS="$CFLAGS -DLWS_NO_DAEMONIZE"                                          
+fi
+AM_CONDITIONAL(NO_DAEMONIZE, test x$no_daemonize = xyes)
+
+#                                                                               
+#                                                                               
+#                                                                               
+AC_ARG_ENABLE(mingw,                                                          
+ [  --enable-mingw  Using mingw compilers, disables ping test build],            
+ [ mingw=yes
+   noping=yes
+ ])                                                                             
+                                                                                
+if test "x$mingw" = "xyes" ; then                                             
+CFLAGS="$CFLAGS -DLWS_MINGW_SUPPORT"                                          
+fi
+AM_CONDITIONAL(MINGW, test x$mingw = xyes)
+
+#
+#
+#
+AC_ARG_WITH([client-cert-dir],
+[AS_HELP_STRING([--with-client-cert-dir],[directory containing client certs, defaults to /etc/pki/tls/certs/])],
+[clientcertdir=$withval],
+[clientcertdir=/etc/pki/tls/certs/]
+)
+AC_SUBST([clientcertdir])
+
+AC_SUBST([CFLAGS])
+
+
+#
+#
+#
+AC_ARG_ENABLE(noping,
+ [  --enable-noping  Do not build ping test app, which has some unixy stuff in sources],
+ [ noping=yes
+ ])
+
+AM_CONDITIONAL(NOPING, test x$noping = xyes)
+
+#
+#
+#
+AC_ARG_ENABLE(debug,
+ [  --disable-debug  Stops debug-related code from even being compiled in, useful for best speed],
+ [ disable_debug=yes
+ ])
+
+if test "x$disable_debug" != "xyes" ; then
+CFLAGS="$CFLAGS -D_DEBUG"
+fi
+AM_CONDITIONAL(DISABLE_DEBUG, test x$disable_debug = xyes)
+
+
+#
+#
+#
+AC_ARG_ENABLE(builtin-getifaddrs,
+ [  --enable-builtin-getifaddrs  Use BSD getifaddrs implementation from libwebsockets... default is your libc provides it],
+ [ builtin_getifaddrs=yes
+ ])
+if test "x$builtin-getifaddrs" = "xyes" ; then
+CFLAGS="$CFLAGS -DLWS_BUILTIN_GETIFADDRS"
+fi
+AM_CONDITIONAL(USE_BUILTIN_GETIFADDRS, test x$builtin_getifaddrs = xyes)
+
+# 
+#
+#
+AC_ARG_WITH(cyassl,
+ [  --with-cyassl  Use CyaSSL instead of OpenSSL ],
+ [ use_cyassl=yes
+ ])
+
+if test "x$use_cyassl" = "xyes" ; then                                     
+CFLAGS="$CFLAGS -DUSE_CYASSL -DLWS_OPENSSL_SUPPORT"
+fi
+AM_CONDITIONAL(USE_CYASSL, test x$use_cyassl = xyes)
+
+
+# Checks for header files.
+AC_CHECK_HEADERS([zlib.h fcntl.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h sys/prctl.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_SIZE_T
+
+# Checks for library functions.
+
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([bzero memset socket strerror])
+
+AC_CONFIG_FILES([Makefile
+                 lib/Makefile
+                 test-server/Makefile])
+
+AC_OUTPUT([
+libwebsockets.pc
+])
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644 (file)
index 0000000..dbed3ff
--- /dev/null
@@ -0,0 +1,8 @@
+#Ignore build files
+Makefile
+*.o
+*.lo
+*.la
+.libs
+.deps
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644 (file)
index 0000000..bd2cb81
--- /dev/null
@@ -0,0 +1,90 @@
+@applyhash@
+
+lib_LTLIBRARIES=libwebsockets.la
+include_HEADERS=libwebsockets.h
+dist_libwebsockets_la_SOURCES=libwebsockets.c \
+                               parsers.c \
+                               handshake.c \
+                               libwebsockets.h \
+                               base64-decode.c \
+                               output.c \
+                               private-libwebsockets.h
+
+if NO_EXTENSIONS
+else
+dist_libwebsockets_la_SOURCES+= extension.c \
+                               extension-deflate-stream.c extension-deflate-stream.h \
+                               extension-deflate-frame.c extension-deflate-frame.h
+endif
+
+if NO_DAEMONIZE
+else
+dist_libwebsockets_la_SOURCES+= daemonize.c
+endif
+
+if NO_CLIENT
+else
+dist_libwebsockets_la_SOURCES+= client.c \
+                               client-parser.c \
+                               client-handshake.c
+endif
+
+if NO_SERVER
+else
+dist_libwebsockets_la_SOURCES+= server.c \
+                               server-handshake.c
+endif
+
+if USE_BUILTIN_GETIFADDRS
+dist_libwebsockets_la_SOURCES += getifaddrs.c
+endif
+
+if LIBCRYPTO
+else
+dist_libwebsockets_la_SOURCES += sha-1.c
+endif
+
+libwebsockets_la_CFLAGS=-Wall -std=gnu99 -pedantic $(SD_DAEMON_CFLAGS)
+libwebsockets_la_LDFLAGS=
+libwebsockets_la_LIBADD=$(SD_DAEMON_LIBS)
+
+# uncomment below and use cat ./lib/.libs/*.su | sort -k2g | tac
+# to get a worst-first list of static stack usage if you have gcc 4.6+
+#libwebsockets_la_CFLAGS+= -fstack-usage
+
+if USE_CYASSL
+libwebsockets_la_LDFLAGS+= -lcyassl
+endif
+
+if DISABLE_DEBUG
+libwebsockets_la_CFLAGS+= -O4
+else
+libwebsockets_la_CFLAGS+= -O0 -g
+endif
+
+if MINGW
+libwebsockets_la_CFLAGS+= -w -I../win32port/win32helpers -I ../win32port/zlib/
+libwebsockets_la_LDFLAGS+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc
+else
+libwebsockets_la_CFLAGS+= -rdynamic -fPIC -Werror
+# notice http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html has rules for how to bump this
+libwebsockets_la_LDFLAGS+=  -version-info 3:0:0
+endif
+
+libwebsockets_la_CFLAGS+= -c \
+       -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
+if NO_EXTENSIONS
+else
+libwebsockets_la_LDFLAGS+= -lz
+endif
+
+all-local:
+        ../scripts/kernel-doc -html \
+                *.c \
+                libwebsockets.h \
+                       > ../libwebsockets-api-doc.html
+        ../scripts/kernel-doc -text \
+                *.c \
+                libwebsockets.h \
+                       > ../libwebsockets-api-doc.txt
+
diff --git a/lib/base64-decode.c b/lib/base64-decode.c
new file mode 100644 (file)
index 0000000..2545d40
--- /dev/null
@@ -0,0 +1,189 @@
+/*
+ * This code originally came from here
+ *
+ * http://base64.sourceforge.net/b64.c
+ *
+ * with the following license:
+ *
+ * LICENCE:        Copyright (c) 2001 Bob Trower, Trantor Standard Systems Inc.
+ *
+ *                Permission is hereby granted, free of charge, to any person
+ *                obtaining a copy of this software and associated
+ *                documentation files (the "Software"), to deal in the
+ *                Software without restriction, including without limitation
+ *                the rights to use, copy, modify, merge, publish, distribute,
+ *                sublicense, and/or sell copies of the Software, and to
+ *                permit persons to whom the Software is furnished to do so,
+ *                subject to the following conditions:
+ *
+ *                The above copyright notice and this permission notice shall
+ *                be included in all copies or substantial portions of the
+ *                Software.
+ *
+ *                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ *                KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ *                WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ *                PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ *                OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *                OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ *                OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *                SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * VERSION HISTORY:
+ *               Bob Trower 08/04/01 -- Create Version 0.00.00B
+ *
+ * I cleaned it up quite a bit to match the (linux kernel) style of the rest
+ * of libwebsockets; this version is under LGPL2 like the rest of libwebsockets
+ * since he explictly allows sublicensing, but I give the URL above so you can
+ * get the original with Bob's super-liberal terms directly if you prefer.
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+#include "private-libwebsockets.h"
+
+static const char encode[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                            "abcdefghijklmnopqrstuvwxyz0123456789+/";
+static const char decode[] = "|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW"
+                            "$$$$$$XYZ[\\]^_`abcdefghijklmnopq";
+
+int
+lws_b64_encode_string(const char *in, int in_len, char *out, int out_size)
+{
+       unsigned char triple[3];
+       int i;
+       int len;
+       int line = 0;
+       int done = 0;
+
+       while (in_len) {
+               len = 0;
+               for (i = 0; i < 3; i++) {
+                       if (in_len) {
+                               triple[i] = *in++;
+                               len++;
+                               in_len--;
+                       } else
+                               triple[i] = 0;
+               }
+               if (!len)
+                       continue;
+
+               if (done + 4 >= out_size)
+                       return -1;
+
+               *out++ = encode[triple[0] >> 2];
+               *out++ = encode[((triple[0] & 0x03) << 4) |
+                                            ((triple[1] & 0xf0) >> 4)];
+               *out++ = (len > 1 ? encode[((triple[1] & 0x0f) << 2) |
+                                            ((triple[2] & 0xc0) >> 6)] : '=');
+               *out++ = (len > 2 ? encode[triple[2] & 0x3f] : '=');
+
+               done += 4;
+               line += 4;
+       }
+
+       if (done + 1 >= out_size)
+               return -1;
+
+       *out++ = '\0';
+
+       return done;
+}
+
+/*
+ * returns length of decoded string in out, or -1 if out was too small
+ * according to out_size
+ */
+
+int
+lws_b64_decode_string(const char *in, char *out, int out_size)
+{
+       int len;
+       int i;
+       int done = 0;
+       unsigned char v;
+       unsigned char quad[4];
+
+       while (*in) {
+
+               len = 0;
+               for (i = 0; i < 4 && *in; i++) {
+
+                       v = 0;
+                       while (*in && !v) {
+
+                               v = *in++;
+                               v = (v < 43 || v > 122) ? 0 : decode[v - 43];
+                               if (v)
+                                       v = (v == '$') ? 0 : v - 61;
+                               if (*in) {
+                                       len++;
+                                       if (v)
+                                               quad[i] = v - 1;
+                               } else
+                                       quad[i] = 0;
+                       }
+               }
+               if (!len)
+                       continue;
+
+               if (out_size < (done + len - 1))
+                       /* out buffer is too small */
+                       return -1;
+
+               if (len >= 2)
+                       *out++ = quad[0] << 2 | quad[1] >> 4;
+               if (len >= 3)
+                       *out++ = quad[1] << 4 | quad[2] >> 2;
+               if (len >= 4)
+                       *out++ = ((quad[2] << 6) & 0xc0) | quad[3];
+
+               done += len - 1;
+       }
+
+       if (done + 1 >= out_size)
+               return -1;
+
+       *out++ = '\0';
+
+       return done;
+}
+
+int
+lws_b64_selftest(void)
+{
+       char buf[64];
+       int n;
+       int test;
+       static const char * const plaintext[] = {
+               "sanity check base 64"
+       };
+       static const char * const coded[] = {
+               "c2FuaXR5IGNoZWNrIGJhc2UgNjQ="
+       };
+
+       for (test = 0; test < sizeof plaintext / sizeof(plaintext[0]); test++) {
+
+               buf[sizeof(buf) - 1] = '\0';
+               n = lws_b64_encode_string(plaintext[test],
+                                     strlen(plaintext[test]), buf, sizeof buf);
+               if (n != strlen(coded[test]) || strcmp(buf, coded[test])) {
+                       lwsl_err("Failed lws_b64 encode selftest "
+                                          "%d result '%s' %d\n", test, buf, n);
+                       return -1;
+               }
+
+               buf[sizeof(buf) - 1] = '\0';
+               n = lws_b64_decode_string(coded[test], buf, sizeof buf);
+               if (n != strlen(plaintext[test]) ||
+                                                strcmp(buf, plaintext[test])) {
+                       lwsl_err("Failed lws_b64 decode selftest "
+                                          "%d result '%s' %d\n", test, buf, n);
+                       return -1;
+               }
+       }
+
+       return 0;
+}
diff --git a/lib/client-handshake.c b/lib/client-handshake.c
new file mode 100644 (file)
index 0000000..f8fb6b5
--- /dev/null
@@ -0,0 +1,328 @@
+#include "private-libwebsockets.h"
+
+struct libwebsocket *__libwebsocket_client_connect_2(
+       struct libwebsocket_context *context,
+       struct libwebsocket *wsi
+) {
+       struct pollfd pfd;
+       struct hostent *server_hostent;
+       struct sockaddr_in server_addr;
+       int n;
+       int plen = 0;
+       const char *ads;
+
+       lwsl_client("__libwebsocket_client_connect_2\n");
+
+       /*
+        * proxy?
+        */
+
+       if (context->http_proxy_port) {
+               plen = sprintf((char *)context->service_buffer,
+                       "CONNECT %s:%u HTTP/1.0\x0d\x0a"
+                       "User-agent: libwebsockets\x0d\x0a"
+/*Proxy-authorization: basic aGVsbG86d29ybGQ= */
+                       "\x0d\x0a",
+                       lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS),
+                       wsi->u.hdr.ah->c_port);
+
+               /* OK from now on we talk via the proxy, so connect to that */
+
+               /*
+                * (will overwrite existing pointer,
+                * leaving old string/frag there but unreferenced)
+                */
+               if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS,
+                                                  context->http_proxy_address))
+                       goto oom4;
+               wsi->u.hdr.ah->c_port = context->http_proxy_port;
+       }
+
+       /*
+        * prepare the actual connection (to the proxy, if any)
+        */
+
+       ads = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS);
+
+       lwsl_client("__libwebsocket_client_connect_2: address %s\n", ads);
+
+       server_hostent = gethostbyname(ads);
+       if (server_hostent == NULL) {
+               lwsl_err("Unable to get host name from %s\n", ads);
+               goto oom4;
+       }
+
+       wsi->sock = socket(AF_INET, SOCK_STREAM, 0);
+
+       if (wsi->sock < 0) {
+               lwsl_warn("Unable to open socket\n");
+               goto oom4;
+       }
+
+       server_addr.sin_family = AF_INET;
+       server_addr.sin_port = htons(wsi->u.hdr.ah->c_port);
+       server_addr.sin_addr = *((struct in_addr *)server_hostent->h_addr);
+       bzero(&server_addr.sin_zero, 8);
+
+       if (connect(wsi->sock, (struct sockaddr *)&server_addr,
+                                            sizeof(struct sockaddr)) == -1)  {
+               lwsl_debug("Connect failed\n");
+               compatible_close(wsi->sock);
+               goto oom4;
+       }
+
+       lwsl_client("connected\n");
+
+       if (lws_set_socket_options(context, wsi->sock)) {
+               lwsl_err("Failed to set wsi socket options\n");
+               close(wsi->sock);
+               goto oom4;
+       }
+
+       insert_wsi_socket_into_fds(context, wsi);
+
+       /* we are connected to server, or proxy */
+
+       if (context->http_proxy_port) {
+
+               n = send(wsi->sock, context->service_buffer, plen, 0);
+               if (n < 0) {
+                       compatible_close(wsi->sock);
+                       lwsl_debug("ERROR writing to proxy socket\n");
+                       goto oom4;
+               }
+
+               libwebsocket_set_timeout(wsi,
+                       PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE,
+                                                             AWAITING_TIMEOUT);
+
+               wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY;
+
+               return wsi;
+       }
+
+       /*
+        * provoke service to issue the handshake directly
+        * we need to do it this way because in the proxy case, this is the
+        * next state and executed only if and when we get a good proxy
+        * response inside the state machine... but notice in SSL case this
+        * may not have sent anything yet with 0 return, and won't until some
+        * many retries from main loop.  To stop that becoming endless,
+        * cover with a timeout.
+        */
+
+       libwebsocket_set_timeout(wsi,
+               PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE, AWAITING_TIMEOUT);
+
+       wsi->mode = LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE;
+       pfd.fd = wsi->sock;
+       pfd.revents = POLLIN;
+
+       n = libwebsocket_service_fd(context, &pfd);
+
+       if (n < 0)
+               goto oom4;
+
+       if (n) /* returns 1 on failure after closing wsi */
+               return NULL;
+
+       return wsi;
+
+oom4:
+       free(wsi->u.hdr.ah);
+       free(wsi);
+
+       return NULL;
+}
+
+/**
+ * libwebsocket_client_connect() - Connect to another websocket server
+ * @context:   Websocket context
+ * @address:   Remote server address, eg, "myserver.com"
+ * @port:      Port to connect to on the remote server, eg, 80
+ * @ssl_connection:    0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
+ *                     signed certs
+ * @path:      Websocket path on server
+ * @host:      Hostname on server
+ * @origin:    Socket origin name
+ * @protocol:  Comma-separated list of protocols being asked for from
+ *             the server, or just one.  The server will pick the one it
+ *             likes best.
+ * @ietf_version_or_minus_one: -1 to ask to connect using the default, latest
+ *             protocol supported, or the specific protocol ordinal
+ *
+ *     This function creates a connection to a remote server
+ */
+
+struct libwebsocket *
+libwebsocket_client_connect(struct libwebsocket_context *context,
+                             const char *address,
+                             int port,
+                             int ssl_connection,
+                             const char *path,
+                             const char *host,
+                             const char *origin,
+                             const char *protocol,
+                             int ietf_version_or_minus_one)
+{
+       struct libwebsocket *wsi;
+#ifndef LWS_NO_EXTENSIONS
+       int n;
+       int m;
+       struct libwebsocket_extension *ext;
+       int handled;
+#endif
+
+#ifndef LWS_OPENSSL_SUPPORT
+       if (ssl_connection) {
+               lwsl_err("libwebsockets not configured for ssl\n");
+               return NULL;
+       }
+#endif
+
+       wsi = (struct libwebsocket *) malloc(sizeof(struct libwebsocket));
+       if (wsi == NULL)
+               goto bail;
+
+       memset(wsi, 0, sizeof(*wsi));
+
+       /* -1 means just use latest supported */
+
+       if (ietf_version_or_minus_one == -1)
+               ietf_version_or_minus_one = SPEC_LATEST_SUPPORTED;
+
+       wsi->ietf_spec_revision = ietf_version_or_minus_one;
+       wsi->user_space = NULL;
+       wsi->state = WSI_STATE_CLIENT_UNCONNECTED;
+       wsi->protocol = NULL;
+       wsi->pending_timeout = NO_PENDING_TIMEOUT;
+#ifndef LWS_NO_EXTENSIONS
+       wsi->count_active_extensions = 0;
+#endif
+#ifdef LWS_OPENSSL_SUPPORT
+       wsi->use_ssl = ssl_connection;
+#endif
+
+       if (lws_allocate_header_table(wsi))
+               goto bail;
+
+       /*
+        * we're not necessarily in a position to action these right away,
+        * stash them... we only need during connect phase so u.hdr is fine
+        */
+       wsi->u.hdr.ah->c_port = port;
+       if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS, address))
+               goto bail1;
+
+       /* these only need u.hdr lifetime as well */
+
+       if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_URI, path))
+               goto bail1;
+
+       if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_HOST, host))
+               goto bail1;
+
+       if (origin)
+               if (lws_hdr_simple_create(wsi,
+                               _WSI_TOKEN_CLIENT_ORIGIN, origin))
+                       goto bail1;
+       /*
+        * this is a list of protocols we tell the server we're okay with
+        * stash it for later when we compare server response with it
+        */
+       if (protocol)
+               if (lws_hdr_simple_create(wsi,
+                               _WSI_TOKEN_CLIENT_SENT_PROTOCOLS, protocol))
+                       goto bail1;
+
+       wsi->protocol = &context->protocols[0];
+
+#ifndef LWS_NO_EXTENSIONS
+       /*
+        * Check with each extension if it is able to route and proxy this
+        * connection for us.  For example, an extension like x-google-mux
+        * can handle this and then we don't need an actual socket for this
+        * connection.
+        */
+
+       handled = 0;
+       ext = context->extensions;
+       n = 0;
+
+       while (ext && ext->callback && !handled) {
+               m = ext->callback(context, ext, wsi,
+                       LWS_EXT_CALLBACK_CAN_PROXY_CLIENT_CONNECTION,
+                                (void *)(long)n, (void *)address, port);
+               if (m)
+                       handled = 1;
+
+               ext++;
+               n++;
+       }
+
+       if (handled) {
+               lwsl_client("libwebsocket_client_connect: ext handling conn\n");
+
+               libwebsocket_set_timeout(wsi,
+                       PENDING_TIMEOUT_AWAITING_EXTENSION_CONNECT_RESPONSE,
+                                                             AWAITING_TIMEOUT);
+
+               wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT;
+               return wsi;
+       }
+#endif
+       lwsl_client("libwebsocket_client_connect: direct conn\n");
+
+       return __libwebsocket_client_connect_2(context, wsi);
+
+bail1:
+       free(wsi->u.hdr.ah);
+bail:
+       free(wsi);
+
+       return NULL;
+}
+
+
+/**
+ * libwebsocket_client_connect_extended() - Connect to another websocket server
+ * @context:   Websocket context
+ * @address:   Remote server address, eg, "myserver.com"
+ * @port:      Port to connect to on the remote server, eg, 80
+ * @ssl_connection:    0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
+ *                     signed certs
+ * @path:      Websocket path on server
+ * @host:      Hostname on server
+ * @origin:    Socket origin name
+ * @protocol:  Comma-separated list of protocols being asked for from
+ *             the server, or just one.  The server will pick the one it
+ *             likes best.
+ * @ietf_version_or_minus_one: -1 to ask to connect using the default, latest
+ *             protocol supported, or the specific protocol ordinal
+ * @userdata: Pre-allocated user data
+ *
+ *     This function creates a connection to a remote server
+ */
+
+struct libwebsocket *
+libwebsocket_client_connect_extended(struct libwebsocket_context *context,
+                             const char *address,
+                             int port,
+                             int ssl_connection,
+                             const char *path,
+                             const char *host,
+                             const char *origin,
+                             const char *protocol,
+                             int ietf_version_or_minus_one,
+                             void *userdata)
+{
+       struct libwebsocket *ws =
+               libwebsocket_client_connect(context, address, port,
+                       ssl_connection, path, host, origin, protocol,
+                                                    ietf_version_or_minus_one);
+
+       if (ws && !ws->user_space && userdata)
+               ws->user_space = userdata ;
+
+       return ws ;
+}
diff --git a/lib/client-parser.c b/lib/client-parser.c
new file mode 100644 (file)
index 0000000..e548b4f
--- /dev/null
@@ -0,0 +1,422 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "private-libwebsockets.h"
+
+int libwebsocket_client_rx_sm(struct libwebsocket *wsi, unsigned char c)
+{
+       int callback_action = LWS_CALLBACK_CLIENT_RECEIVE;
+       int handled;
+       struct lws_tokens eff_buf;
+#ifndef LWS_NO_EXTENSIONS
+       int n;
+       int m;
+#endif
+
+       switch (wsi->lws_rx_parse_state) {
+       case LWS_RXPS_NEW:
+
+               switch (wsi->ietf_spec_revision) {
+
+               case 13:
+                       wsi->u.ws.opcode = c & 0xf;
+                       wsi->u.ws.rsv = (c & 0x70);
+                       wsi->u.ws.final = !!((c >> 7) & 1);
+                       switch (wsi->u.ws.opcode) {
+                       case LWS_WS_OPCODE_07__TEXT_FRAME:
+                       case LWS_WS_OPCODE_07__BINARY_FRAME:
+                               wsi->u.ws.frame_is_binary = wsi->u.ws.opcode ==
+                                                LWS_WS_OPCODE_07__BINARY_FRAME;
+                               break;
+                       }
+                       wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN;
+                       break;
+
+               default:
+                       lwsl_err("unknown spec version %02d\n",
+                                                      wsi->ietf_spec_revision);
+                       break;
+               }
+               break;
+
+
+       case LWS_RXPS_04_FRAME_HDR_LEN:
+
+               wsi->u.ws.this_frame_masked = !!(c & 0x80);
+
+               switch (c & 0x7f) {
+               case 126:
+                       /* control frames are not allowed to have big lengths */
+                       if (wsi->u.ws.opcode & 8)
+                               goto illegal_ctl_length;
+                       wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_2;
+                       break;
+               case 127:
+                       /* control frames are not allowed to have big lengths */
+                       if (wsi->u.ws.opcode & 8)
+                               goto illegal_ctl_length;
+                       wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_8;
+                       break;
+               default:
+                       wsi->u.ws.rx_packet_length = c;
+                       if (wsi->u.ws.this_frame_masked)
+                               wsi->lws_rx_parse_state =
+                                               LWS_RXPS_07_COLLECT_FRAME_KEY_1;
+                       else {
+                               if (c)
+                                       wsi->lws_rx_parse_state =
+                                       LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
+                               else {
+                                       wsi->lws_rx_parse_state = LWS_RXPS_NEW;
+                                       goto spill;
+                               }
+                       }
+                       break;
+               }
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN16_2:
+               wsi->u.ws.rx_packet_length = c << 8;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_1;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN16_1:
+               wsi->u.ws.rx_packet_length |= c;
+               if (wsi->u.ws.this_frame_masked)
+                       wsi->lws_rx_parse_state =
+                                       LWS_RXPS_07_COLLECT_FRAME_KEY_1;
+               else {
+                       if (wsi->u.ws.rx_packet_length)
+                               wsi->lws_rx_parse_state =
+                                       LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
+                       else {
+                               wsi->lws_rx_parse_state = LWS_RXPS_NEW;
+                               goto spill;
+                       }
+               }
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_8:
+               if (c & 0x80) {
+                       lwsl_warn("b63 of length must be zero\n");
+                       /* kill the connection */
+                       return -1;
+               }
+#if defined __LP64__
+               wsi->u.ws.rx_packet_length = ((size_t)c) << 56;
+#else
+               wsi->u.ws.rx_packet_length = 0;
+#endif
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_7;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_7:
+#if defined __LP64__
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 48;
+#endif
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_6;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_6:
+#if defined __LP64__
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 40;
+#endif
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_5;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_5:
+#if defined __LP64__
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 32;
+#endif
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_4;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_4:
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 24;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_3;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_3:
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 16;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_2;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_2:
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 8;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_1;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_1:
+               wsi->u.ws.rx_packet_length |= (size_t)c;
+               if (wsi->u.ws.this_frame_masked)
+                       wsi->lws_rx_parse_state =
+                                       LWS_RXPS_07_COLLECT_FRAME_KEY_1;
+               else {
+                       if (wsi->u.ws.rx_packet_length)
+                               wsi->lws_rx_parse_state =
+                                       LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
+                       else {
+                               wsi->lws_rx_parse_state = LWS_RXPS_NEW;
+                               goto spill;
+                       }
+               }
+               break;
+
+       case LWS_RXPS_07_COLLECT_FRAME_KEY_1:
+               wsi->u.ws.frame_masking_nonce_04[0] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_2;
+               break;
+
+       case LWS_RXPS_07_COLLECT_FRAME_KEY_2:
+               wsi->u.ws.frame_masking_nonce_04[1] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_3;
+               break;
+
+       case LWS_RXPS_07_COLLECT_FRAME_KEY_3:
+               wsi->u.ws.frame_masking_nonce_04[2] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_4;
+               break;
+
+       case LWS_RXPS_07_COLLECT_FRAME_KEY_4:
+               wsi->u.ws.frame_masking_nonce_04[3] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+
+               if (wsi->u.ws.rx_packet_length)
+                       wsi->lws_rx_parse_state =
+                                       LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
+               else {
+                       wsi->lws_rx_parse_state = LWS_RXPS_NEW;
+                       goto spill;
+               }
+               break;
+
+       case LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED:
+
+               if (!wsi->u.ws.rx_user_buffer)
+                       lwsl_err("NULL client rx_user_buffer\n");
+
+               if ((!wsi->u.ws.this_frame_masked) || wsi->u.ws.all_zero_nonce)
+                       wsi->u.ws.rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING +
+                              (wsi->u.ws.rx_user_buffer_head++)] = c;
+               else
+                       wsi->u.ws.rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING +
+                              (wsi->u.ws.rx_user_buffer_head++)] =
+                       c ^ wsi->u.ws.frame_masking_nonce_04[
+                                           (wsi->u.ws.frame_mask_index++) & 3];
+
+               if (--wsi->u.ws.rx_packet_length == 0) {
+                       /* spill because we have the whole frame */
+                       wsi->lws_rx_parse_state = LWS_RXPS_NEW;
+                       goto spill;
+               }
+
+               /*
+                * if there's no protocol max frame size given, we are
+                * supposed to default to LWS_MAX_SOCKET_IO_BUF
+                */
+
+               if (!wsi->protocol->rx_buffer_size &&
+                                       wsi->u.ws.rx_user_buffer_head !=
+                                                         LWS_MAX_SOCKET_IO_BUF)
+                       break;
+               else
+                       if (wsi->protocol->rx_buffer_size &&
+                                       wsi->u.ws.rx_user_buffer_head !=
+                                                 wsi->protocol->rx_buffer_size)
+                       break;
+
+               /* spill because we filled our rx buffer */
+spill:
+
+               handled = 0;
+
+               /*
+                * is this frame a control packet we should take care of at this
+                * layer?  If so service it and hide it from the user callback
+                */
+
+               switch (wsi->u.ws.opcode) {
+               case LWS_WS_OPCODE_07__CLOSE:
+                       /* is this an acknowledgement of our close? */
+                       if (wsi->state == WSI_STATE_AWAITING_CLOSE_ACK) {
+                               /*
+                                * fine he has told us he is closing too, let's
+                                * finish our close
+                                */
+                               lwsl_parser("seen server's close ack\n");
+                               return -1;
+                       }
+                       lwsl_parser("client sees server close len = %d\n",
+                                                wsi->u.ws.rx_user_buffer_head);
+                       /*
+                        * parrot the close packet payload back
+                        * we do not care about how it went, we are closing
+                        * immediately afterwards
+                        */
+                       libwebsocket_write(wsi, (unsigned char *)
+                          &wsi->u.ws.rx_user_buffer[
+                               LWS_SEND_BUFFER_PRE_PADDING],
+                               wsi->u.ws.rx_user_buffer_head, LWS_WRITE_CLOSE);
+                       wsi->state = WSI_STATE_RETURNED_CLOSE_ALREADY;
+                       /* close the connection */
+                       return -1;
+
+               case LWS_WS_OPCODE_07__PING:
+                       lwsl_info("client received ping, doing pong\n");
+                       /*
+                        * parrot the ping packet payload back as a pong
+                        * !!! this may block or have partial write or fail
+                        * !!! very unlikely if the ping size is small
+                        */
+                       libwebsocket_write(wsi, (unsigned char *)
+                           &wsi->u.ws.rx_user_buffer[
+                               LWS_SEND_BUFFER_PRE_PADDING],
+                                       wsi->u.ws.rx_user_buffer_head,
+                                                               LWS_WRITE_PONG);
+                       handled = 1;
+                       break;
+
+               case LWS_WS_OPCODE_07__PONG:
+                       lwsl_info("client receied pong\n");
+                       lwsl_hexdump(&wsi->u.ws.rx_user_buffer[
+                               LWS_SEND_BUFFER_PRE_PADDING],
+                                   wsi->u.ws.rx_user_buffer_head);
+
+                       /* issue it */
+                       callback_action = LWS_CALLBACK_CLIENT_RECEIVE_PONG;
+                       break;
+
+               case LWS_WS_OPCODE_07__CONTINUATION:
+               case LWS_WS_OPCODE_07__TEXT_FRAME:
+               case LWS_WS_OPCODE_07__BINARY_FRAME:
+                       break;
+
+               default:
+
+                       lwsl_parser("Reserved opc 0x%2X\n", wsi->u.ws.opcode);
+#ifndef LWS_NO_EXTENSIONS
+                       /*
+                        * It's something special we can't understand here.
+                        * Pass the payload up to the extension's parsing
+                        * state machine.
+                        */
+
+                       eff_buf.token = &wsi->u.ws.rx_user_buffer[
+                                                  LWS_SEND_BUFFER_PRE_PADDING];
+                       eff_buf.token_len = wsi->u.ws.rx_user_buffer_head;
+
+                       for (n = 0; n < wsi->count_active_extensions; n++) {
+                               m = wsi->active_extensions[n]->callback(
+                                       wsi->protocol->owning_server,
+                                       wsi->active_extensions[n], wsi,
+                                       LWS_EXT_CALLBACK_EXTENDED_PAYLOAD_RX,
+                                           wsi->active_extensions_user[n],
+                                                                  &eff_buf, 0);
+                               if (m)
+                                       handled = 1;
+                       }
+
+                       if (!handled) {
+#else
+                       {
+#endif
+                               lwsl_ext("Unhandled ext opc 0x%x\n",
+                                                             wsi->u.ws.opcode);
+                               wsi->u.ws.rx_user_buffer_head = 0;
+
+                               return 0;
+                       }
+
+                       break;
+               }
+
+               /*
+                * No it's real payload, pass it up to the user callback.
+                * It's nicely buffered with the pre-padding taken care of
+                * so it can be sent straight out again using libwebsocket_write
+                */
+               if (handled)
+                       goto already_done;
+
+               eff_buf.token = &wsi->u.ws.rx_user_buffer[
+                                               LWS_SEND_BUFFER_PRE_PADDING];
+               eff_buf.token_len = wsi->u.ws.rx_user_buffer_head;
+#ifndef LWS_NO_EXTENSIONS
+               for (n = 0; n < wsi->count_active_extensions; n++) {
+                       m = wsi->active_extensions[n]->callback(
+                               wsi->protocol->owning_server,
+                               wsi->active_extensions[n], wsi,
+                               LWS_EXT_CALLBACK_PAYLOAD_RX,
+                               wsi->active_extensions_user[n],
+                               &eff_buf, 0);
+                       if (m < 0) {
+                               lwsl_ext(
+                                       "Ext '%s' failed to handle payload!\n",
+                                              wsi->active_extensions[n]->name);
+                               return -1;
+                       }
+               }
+#endif
+               if (eff_buf.token_len <= 0)
+                       goto already_done;
+
+               eff_buf.token[eff_buf.token_len] = '\0';
+
+               if (!wsi->protocol->callback)
+                       goto already_done;
+
+               if (callback_action == LWS_CALLBACK_CLIENT_RECEIVE_PONG)
+                       lwsl_info("Client doing pong callback\n");
+
+               wsi->protocol->callback(
+                       wsi->protocol->owning_server,
+                       wsi,
+                       (enum libwebsocket_callback_reasons)callback_action,
+                       wsi->user_space,
+                       eff_buf.token,
+                       eff_buf.token_len);
+
+already_done:
+               wsi->u.ws.rx_user_buffer_head = 0;
+               break;
+       default:
+               lwsl_err("client rx illegal state\n");
+               return 1;
+       }
+
+       return 0;
+
+illegal_ctl_length:
+
+       lwsl_warn("Control frame asking for extended length is illegal\n");
+       /* kill the connection */
+       return -1;
+
+}
+
+
diff --git a/lib/client.c b/lib/client.c
new file mode 100644 (file)
index 0000000..3da9326
--- /dev/null
@@ -0,0 +1,853 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "private-libwebsockets.h"
+
+#ifdef WIN32
+#include <tchar.h>
+#include <io.h>
+#else
+#ifdef LWS_BUILTIN_GETIFADDRS
+#include <getifaddrs.h>
+#else
+#include <ifaddrs.h>
+#endif
+#include <sys/un.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#endif
+
+int lws_client_socket_service(struct libwebsocket_context *context,
+                               struct libwebsocket *wsi, struct pollfd *pollfd)
+{
+       int n;
+       char *p = (char *)&context->service_buffer[0];
+       int len;
+       char c;
+
+       switch (wsi->mode) {
+
+       case LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY:
+
+               /* handle proxy hung up on us */
+
+               if (pollfd->revents & (POLLERR | POLLHUP)) {
+
+                       lwsl_warn("Proxy connection %p (fd=%d) dead\n",
+                               (void *)wsi, pollfd->fd);
+
+                       libwebsocket_close_and_free_session(context, wsi,
+                                                    LWS_CLOSE_STATUS_NOSTATUS);
+                       return 0;
+               }
+
+               n = recv(wsi->sock, context->service_buffer,
+                                       sizeof(context->service_buffer), 0);
+               if (n < 0) {
+                       libwebsocket_close_and_free_session(context, wsi,
+                                                    LWS_CLOSE_STATUS_NOSTATUS);
+                       lwsl_err("ERROR reading from proxy socket\n");
+                       return 0;
+               }
+
+               context->service_buffer[13] = '\0';
+               if (strcmp((char *)context->service_buffer, "HTTP/1.0 200 ")) {
+                       libwebsocket_close_and_free_session(context, wsi,
+                                                    LWS_CLOSE_STATUS_NOSTATUS);
+                       lwsl_err("ERROR proxy: %s\n", context->service_buffer);
+                       return 0;
+               }
+
+               /* clear his proxy connection timeout */
+
+               libwebsocket_set_timeout(wsi, NO_PENDING_TIMEOUT, 0);
+
+               /* fallthru */
+
+       case LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE:
+
+               /*
+                * we are under PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE
+                * timeout protection set in client-handshake.c
+                */
+
+       #ifdef LWS_OPENSSL_SUPPORT
+
+               /*
+                * take care of our libwebsocket_callback_on_writable
+                * happening at a time when there's no real connection yet
+                */
+
+               pollfd->events &= ~POLLOUT;
+
+               /* external POLL support via protocol 0 */
+               context->protocols[0].callback(context, wsi,
+                       LWS_CALLBACK_CLEAR_MODE_POLL_FD,
+                       wsi->user_space, (void *)(long)wsi->sock, POLLOUT);
+
+               /* we can retry this... just cook the SSL BIO the first time */
+
+               if (wsi->use_ssl && !wsi->ssl) {
+
+                       wsi->ssl = SSL_new(context->ssl_client_ctx);
+
+#ifdef USE_CYASSL
+                       /*
+                        * CyaSSL does certificate verification differently
+                        * from OpenSSL.
+                        * If we should ignore the certificate, we need to set
+                        * this before SSL_new and SSL_connect is called.
+                        * Otherwise the connect will simply fail with error
+                        * code -155
+                        */
+                       if (wsi->use_ssl == 2)
+                               CyaSSL_set_verify(wsi->ssl,
+                                                       SSL_VERIFY_NONE, NULL);
+#endif /* USE_CYASSL */
+
+                       wsi->client_bio =
+                               BIO_new_socket(wsi->sock, BIO_NOCLOSE);
+                       SSL_set_bio(wsi->ssl, wsi->client_bio, wsi->client_bio);
+
+#ifdef USE_CYASSL
+                       CyaSSL_set_using_nonblock(wsi->ssl, 1);
+#else
+                       BIO_set_nbio(wsi->client_bio, 1); /* nonblocking */
+#endif
+
+                       SSL_set_ex_data(wsi->ssl,
+                                       openssl_websocket_private_data_index,
+                                                                      context);
+               }
+
+               if (wsi->use_ssl) {
+                       lws_latency_pre(context, wsi);
+                       n = SSL_connect(wsi->ssl);
+                       lws_latency(context, wsi,
+                         "SSL_connect LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE",
+                                                                     n, n > 0);
+
+                       if (n < 0) {
+                               n = SSL_get_error(wsi->ssl, n);
+
+                               if (n == SSL_ERROR_WANT_READ ||
+                                       n == SSL_ERROR_WANT_WRITE) {
+                                       /*
+                                        * wants us to retry connect due to
+                                        * state of the underlying ssl layer...
+                                        * but since it may be stalled on
+                                        * blocked write, no incoming data may
+                                        * arrive to trigger the retry.
+                                        * Force (possibly many times if the SSL
+                                        * state persists in returning the
+                                        * condition code, but other sockets
+                                        * are getting serviced inbetweentimes)
+                                        * us to get called back when writable.
+                                        */
+
+                                       lwsl_info(
+                                            "SSL_connect WANT_... retrying\n");
+                                       libwebsocket_callback_on_writable(
+                                                                 context, wsi);
+
+                                       return 0; /* no error */
+                               }
+                               n = -1;
+                       }
+
+                       if (n <= 0) {
+                               /*
+                                * retry if new data comes until we
+                                * run into the connection timeout or win
+                                */
+
+                               lwsl_err("SSL connect error %lu: %s\n", 
+                                       ERR_get_error(),
+                                       ERR_error_string(ERR_get_error(),
+                                             (char *)context->service_buffer));
+                               return 0;
+                       }
+
+                       #ifndef USE_CYASSL
+                       /*
+                        * See comment above about CyaSSL certificate
+                        * verification
+                        */
+                       lws_latency_pre(context, wsi);
+                       n = SSL_get_verify_result(wsi->ssl);
+                       lws_latency(context, wsi,
+                               "SSL_get_verify_result LWS_CONNMODE..HANDSHAKE",
+                                                                     n, n > 0);
+                       if ((n != X509_V_OK) && (
+                               n != X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT ||
+                                                          wsi->use_ssl != 2)) {
+
+                               lwsl_err(
+                                     "server's cert didn't look good %d\n", n);
+                               libwebsocket_close_and_free_session(context,
+                                               wsi, LWS_CLOSE_STATUS_NOSTATUS);
+                               return 0;
+                       }
+#endif /* USE_CYASSL */
+               } else
+                       wsi->ssl = NULL;
+#endif
+
+               p = libwebsockets_generate_client_handshake(context, wsi, p);
+               if (p == NULL) {
+                       lwsl_err("Failed to generate handshake for client\n");
+                       libwebsocket_close_and_free_session(context, wsi,
+                                                    LWS_CLOSE_STATUS_NOSTATUS);
+                       return 0;
+               }
+
+               /* send our request to the server */
+
+               lws_latency_pre(context, wsi);
+#ifdef LWS_OPENSSL_SUPPORT
+               if (wsi->use_ssl)
+                       n = SSL_write(wsi->ssl, context->service_buffer,
+                                          p - (char *)context->service_buffer);
+               else
+#endif
+                       n = send(wsi->sock, context->service_buffer,
+                                       p - (char *)context->service_buffer, 0);
+               lws_latency(context, wsi,
+                       "send or SSL_write LWS_CONNMODE...HANDSHAKE",
+                                                                    n, n >= 0);
+
+               if (n < 0) {
+                       lwsl_debug("ERROR writing to client socket\n");
+                       libwebsocket_close_and_free_session(context, wsi,
+                                                    LWS_CLOSE_STATUS_NOSTATUS);
+                       return 0;
+               }
+
+               wsi->u.hdr.parser_state = WSI_TOKEN_NAME_PART;
+               wsi->u.hdr.lextable_pos = 0;
+               wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY;
+               libwebsocket_set_timeout(wsi,
+                               PENDING_TIMEOUT_AWAITING_SERVER_RESPONSE,
+                                                             AWAITING_TIMEOUT);
+               break;
+
+       case LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY:
+
+               /* handle server hung up on us */
+
+               if (pollfd->revents & (POLLERR | POLLHUP)) {
+
+                       lwsl_debug("Server connection %p (fd=%d) dead\n",
+                               (void *)wsi, pollfd->fd);
+
+                       goto bail3;
+               }
+
+               if (!(pollfd->revents & POLLIN)) {
+                       lwsl_warn("server reply no POLLIN\n");
+                       goto bail3;
+               }
+
+               /* interpret the server response */
+
+               /*
+                *  HTTP/1.1 101 Switching Protocols
+                *  Upgrade: websocket
+                *  Connection: Upgrade
+                *  Sec-WebSocket-Accept: me89jWimTRKTWwrS3aRrL53YZSo=
+                *  Sec-WebSocket-Nonce: AQIDBAUGBwgJCgsMDQ4PEC==
+                *  Sec-WebSocket-Protocol: chat
+                */
+
+               /*
+                * we have to take some care here to only take from the
+                * socket bytewise.  The browser may (and has been seen to
+                * in the case that onopen() performs websocket traffic)
+                * coalesce both handshake response and websocket traffic
+                * in one packet, since at that point the connection is
+                * definitively ready from browser pov.
+                */
+
+               len = 1;
+               while (wsi->u.hdr.parser_state != WSI_PARSING_COMPLETE &&
+                                                                     len > 0) {
+#ifdef LWS_OPENSSL_SUPPORT
+                       if (wsi->use_ssl) {
+                               len = SSL_read(wsi->ssl, &c, 1);
+                               if (len < 0) {
+                                       n = SSL_get_error(wsi->ssl, len);
+                                       if (n ==  SSL_ERROR_WANT_READ ||
+                                                    n ==  SSL_ERROR_WANT_WRITE)
+                                               return 0;
+                               }
+                       } else
+#endif
+                               len = recv(wsi->sock, &c, 1, 0);
+
+                       if (len < 0) {
+                               lwsl_warn("error on parsing recv\n");
+                               goto bail3;
+                       }
+
+                       if (libwebsocket_parse(wsi, c)) {
+                               lwsl_warn("problems parsing header\n");
+                               goto bail3;
+                       }
+               }
+
+               /*
+                * hs may also be coming in multiple packets, there is a 5-sec
+                * libwebsocket timeout still active here too, so if parsing did
+                * not complete just wait for next packet coming in this state
+                */
+
+               if (wsi->u.hdr.parser_state != WSI_PARSING_COMPLETE)
+                       break;
+
+               /*
+                * otherwise deal with the handshake.  If there's any
+                * packet traffic already arrived we'll trigger poll() again
+                * right away and deal with it that way
+                */
+
+               return lws_client_interpret_server_handshake(context, wsi);
+
+bail3:
+               lwsl_info(
+                       "closing connection at LWS_CONNMODE...SERVER_REPLY\n");
+               libwebsocket_close_and_free_session(context, wsi,
+                                                   LWS_CLOSE_STATUS_NOSTATUS);
+               return 0;
+
+       case LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT:
+               lwsl_ext("LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT\n");
+               break;
+
+       case LWS_CONNMODE_WS_CLIENT_PENDING_CANDIDATE_CHILD:
+               lwsl_ext("LWS_CONNMODE_WS_CLIENT_PENDING_CANDIDATE_CHILD\n");
+               break;
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+
+/*
+ * In-place str to lower case
+ */
+
+static void
+strtolower(char *s)
+{
+       while (*s) {
+               *s = tolower(*s);
+               s++;
+       }
+}
+
+int
+lws_client_interpret_server_handshake(struct libwebsocket_context *context,
+               struct libwebsocket *wsi)
+{
+       const char *pc;
+       int okay = 0;
+       char *p;
+       int len;
+#ifndef LWS_NO_EXTENSIONS
+       char ext_name[128];
+       struct libwebsocket_extension *ext;
+       void *v;
+       int more = 1;
+       const char *c;
+#endif
+       int n;
+
+       /*
+        * well, what the server sent looked reasonable for syntax.
+        * Now let's confirm it sent all the necessary headers
+        */
+
+       if (lws_hdr_total_length(wsi, WSI_TOKEN_ACCEPT) == 0) {
+               lwsl_info("no ACCEPT\n");
+               goto bail3;
+       }
+
+       p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_HTTP);
+       if (!p) {
+               lwsl_info("no URI\n");
+               goto bail3;
+       }
+       if (p && strncmp(p, "101", 3)) {
+               lwsl_warn(
+                      "lws_client_handshake: got bad HTTP response '%s'\n", p);
+               goto bail3;
+       }
+
+       p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_UPGRADE);
+       if (!p) {
+               lwsl_info("no UPGRADE\n");
+               goto bail3;
+       }
+       strtolower(p);
+       if (strcmp(p, "websocket")) {
+               lwsl_warn(
+                     "lws_client_handshake: got bad Upgrade header '%s'\n", p);
+               goto bail3;
+       }
+
+       p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_CONNECTION);
+       if (!p) {
+               lwsl_info("no Connection hdr\n");
+               goto bail3;
+       }
+       strtolower(p);
+       if (strcmp(p, "upgrade")) {
+               lwsl_warn("lws_client_int_s_hs: bad header %s\n", p);
+               goto bail3;
+       }
+
+       pc = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_SENT_PROTOCOLS);
+       if (pc == NULL)
+               lwsl_parser("lws_client_int_s_hs: no protocol list\n");
+       else
+               lwsl_parser("lws_client_int_s_hs: protocol list '%s'\n", pc);
+
+       /*
+        * confirm the protocol the server wants to talk was in the list
+        * of protocols we offered
+        */
+
+       len = lws_hdr_total_length(wsi, WSI_TOKEN_PROTOCOL);
+       if (!len) {
+
+               lwsl_info("lws_client_int_s_hs: WSI_TOKEN_PROTOCOL is null\n");
+               /*
+                * no protocol name to work from,
+                * default to first protocol
+                */
+               wsi->protocol = &context->protocols[0];
+               goto check_extensions;
+       }
+
+       p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_PROTOCOL);
+       len = strlen(p);
+
+       while (*pc && !okay) {
+               if (!strncmp(pc, p, len) &&
+                                         (pc[len] == ',' || pc[len] == '\0')) {
+                       okay = 1;
+                       continue;
+               }
+               while (*pc && *pc != ',')
+                       pc++;
+               while (*pc && *pc != ' ')
+                       pc++;
+       }
+
+       if (!okay) {
+               lwsl_err("lws_client_int_s_hs: got bad protocol %s\n", p);
+               goto bail2;
+       }
+
+       /*
+        * identify the selected protocol struct and set it
+        */
+       n = 0;
+       wsi->protocol = NULL;
+       while (context->protocols[n].callback && !wsi->protocol) {
+               if (strcmp(p, context->protocols[n].name) == 0) {
+                       wsi->protocol = &context->protocols[n];
+                       break;
+               }
+               n++;
+       }
+
+       if (wsi->protocol == NULL) {
+               lwsl_err("lws_client_int_s_hs: fail protocol %s\n", p);
+               goto bail2;
+       }
+
+
+check_extensions:
+#ifndef LWS_NO_EXTENSIONS
+       /* instantiate the accepted extensions */
+
+       if (!lws_hdr_total_length(wsi, WSI_TOKEN_EXTENSIONS)) {
+               lwsl_ext("no client extenstions allowed by server\n");
+               goto check_accept;
+       }
+
+       /*
+        * break down the list of server accepted extensions
+        * and go through matching them or identifying bogons
+        */
+
+       if (lws_hdr_copy(wsi, (char *)context->service_buffer,
+                  sizeof(context->service_buffer), WSI_TOKEN_EXTENSIONS) < 0) {
+               lwsl_warn("ext list from server failed to copy\n");
+               goto bail2;
+       }
+
+       c = (char *)context->service_buffer;
+       n = 0;
+       while (more) {
+
+               if (*c && (*c != ',' && *c != ' ' && *c != '\t')) {
+                       ext_name[n] = *c++;
+                       if (n < sizeof(ext_name) - 1)
+                               n++;
+                       continue;
+               }
+               ext_name[n] = '\0';
+               if (!*c)
+                       more = 0;
+               else {
+                       c++;
+                       if (!n)
+                               continue;
+               }
+
+               /* check we actually support it */
+
+               lwsl_ext("checking client ext %s\n", ext_name);
+
+               n = 0;
+               ext = wsi->protocol->owning_server->extensions;
+               while (ext && ext->callback) {
+
+                       if (strcmp(ext_name, ext->name)) {
+                               ext++;
+                               continue;
+                       }
+
+                       n = 1;
+
+                       lwsl_ext("instantiating client ext %s\n", ext_name);
+
+                       /* instantiate the extension on this conn */
+
+                       wsi->active_extensions_user[
+                               wsi->count_active_extensions] =
+                                        malloc(ext->per_session_data_size);
+                       if (wsi->active_extensions_user[
+                               wsi->count_active_extensions] == NULL) {
+                               lwsl_err("Out of mem\n");
+                               goto bail2;
+                       }
+                       memset(wsi->active_extensions_user[
+                               wsi->count_active_extensions], 0,
+                                                   ext->per_session_data_size);
+                       wsi->active_extensions[
+                                 wsi->count_active_extensions] = ext;
+
+                       /* allow him to construct his context */
+
+                       ext->callback(wsi->protocol->owning_server,
+                               ext, wsi,
+                                  LWS_EXT_CALLBACK_CLIENT_CONSTRUCT,
+                                       wsi->active_extensions_user[
+                                        wsi->count_active_extensions],
+                                                                  NULL, 0);
+
+                       wsi->count_active_extensions++;
+
+                       ext++;
+               }
+
+               if (n == 0) {
+                       lwsl_warn("Unknown ext '%s'!\n", ext_name);
+                       goto bail2;
+               }
+
+               n = 0;
+       }
+
+check_accept:
+#endif
+
+       /*
+        * Confirm his accept token is the one we precomputed
+        */
+
+       p = lws_hdr_simple_ptr(wsi, WSI_TOKEN_ACCEPT);
+       if (strcmp(p, wsi->u.hdr.ah->initial_handshake_hash_base64)) {
+               lwsl_warn("lws_client_int_s_hs: accept %s wrong vs %s\n", p,
+                                 wsi->u.hdr.ah->initial_handshake_hash_base64);
+               goto bail2;
+       }
+
+       /* allocate the per-connection user memory (if any) */
+       if (libwebsocket_ensure_user_space(wsi)) {
+               lwsl_err("Problem allocating wsi user mem\n");
+               goto bail2;
+       }
+
+       /*
+        * we seem to be good to go, give client last chance to check
+        * headers and OK it
+        */
+
+       wsi->protocol->callback(context, wsi,
+                               LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH,
+                                                    wsi->user_space, NULL, 0);
+
+       /* clear his proxy connection timeout */
+
+       libwebsocket_set_timeout(wsi, NO_PENDING_TIMEOUT, 0);
+
+       /* free up his parsing allocations */
+       if (wsi->u.hdr.ah)
+               free(wsi->u.hdr.ah);
+
+       /* mark him as being alive */
+
+       wsi->state = WSI_STATE_ESTABLISHED;
+       wsi->mode = LWS_CONNMODE_WS_CLIENT;
+
+       /* union transition */
+
+       memset(&wsi->u, 0, sizeof(wsi->u));
+
+       /*
+        * create the frame buffer for this connection according to the
+        * size mentioned in the protocol definition.  If 0 there, then
+        * use a big default for compatibility
+        */
+
+       n = wsi->protocol->rx_buffer_size;
+       if (!n)
+               n = LWS_MAX_SOCKET_IO_BUF;
+       n += LWS_SEND_BUFFER_PRE_PADDING + LWS_SEND_BUFFER_POST_PADDING;
+       wsi->u.ws.rx_user_buffer = malloc(n);
+       if (!wsi->u.ws.rx_user_buffer) {
+               lwsl_err("Out of Mem allocating rx buffer %d\n", n);
+               goto bail3;
+       }
+       lwsl_info("Allocating client RX buffer %d\n", n);
+
+       lwsl_debug("handshake OK for protocol %s\n", wsi->protocol->name);
+
+       /* call him back to inform him he is up */
+
+       wsi->protocol->callback(context, wsi,
+                               LWS_CALLBACK_CLIENT_ESTABLISHED,
+                                                    wsi->user_space, NULL, 0);
+#ifndef LWS_NO_EXTENSIONS
+       /*
+        * inform all extensions, not just active ones since they
+        * already know
+        */
+
+       ext = context->extensions;
+
+       while (ext && ext->callback) {
+               v = NULL;
+               for (n = 0; n < wsi->count_active_extensions; n++)
+                       if (wsi->active_extensions[n] == ext)
+                               v = wsi->active_extensions_user[n];
+
+               ext->callback(context, ext, wsi,
+                         LWS_EXT_CALLBACK_ANY_WSI_ESTABLISHED, v, NULL, 0);
+               ext++;
+       }
+#endif
+
+       return 0;
+
+bail3:
+
+bail2:
+       if (wsi->protocol)
+               wsi->protocol->callback(context, wsi,
+                       LWS_CALLBACK_CLIENT_CONNECTION_ERROR,
+                                                     wsi->user_space, NULL, 0);
+
+       lwsl_info("closing connection due to bail2 connection error\n");
+
+       /* free up his parsing allocations */
+
+       if (wsi->u.hdr.ah)
+               free(wsi->u.hdr.ah);
+
+       libwebsocket_close_and_free_session(context, wsi,
+                                                LWS_CLOSE_STATUS_PROTOCOL_ERR);
+
+       return 1;
+}
+
+
+char *
+libwebsockets_generate_client_handshake(struct libwebsocket_context *context,
+               struct libwebsocket *wsi, char *pkt)
+{
+       char buf[128];
+       char hash[20];
+       char key_b64[40];
+       char *p = pkt;
+       int n;
+#ifndef LWS_NO_EXTENSIONS
+       struct libwebsocket_extension *ext;
+       struct libwebsocket_extension *ext1;
+       int ext_count = 0;
+#endif
+
+       /*
+        * create the random key
+        */
+
+       n = libwebsockets_get_random(context, hash, 16);
+       if (n != 16) {
+               lwsl_err("Unable to read from random dev %s\n",
+                                               SYSTEM_RANDOM_FILEPATH);
+               libwebsocket_close_and_free_session(context, wsi,
+                                            LWS_CLOSE_STATUS_NOSTATUS);
+               return NULL;
+       }
+
+       lws_b64_encode_string(hash, 16, key_b64, sizeof(key_b64));
+
+       /*
+        * 00 example client handshake
+        *
+        * GET /socket.io/websocket HTTP/1.1
+        * Upgrade: WebSocket
+        * Connection: Upgrade
+        * Host: 127.0.0.1:9999
+        * Origin: http://127.0.0.1
+        * Sec-WebSocket-Key1: 1 0 2#0W 9 89 7  92 ^
+        * Sec-WebSocket-Key2: 7 7Y 4328 B2v[8(z1
+        * Cookie: socketio=websocket
+        *
+        * (Á®Ä0¶†≥
+        *
+        * 04 example client handshake
+        *
+        * GET /chat HTTP/1.1
+        * Host: server.example.com
+        * Upgrade: websocket
+        * Connection: Upgrade
+        * Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
+        * Sec-WebSocket-Origin: http://example.com
+        * Sec-WebSocket-Protocol: chat, superchat
+        * Sec-WebSocket-Version: 4
+        */
+
+       p += sprintf(p, "GET %s HTTP/1.1\x0d\x0a",
+                               lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_URI));
+
+       p += sprintf(p,
+               "Pragma: no-cache\x0d\x0a""Cache-Control: no-cache\x0d\x0a");
+
+       p += sprintf(p, "Host: %s\x0d\x0a",
+                              lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_HOST));
+       p += sprintf(p,
+"Upgrade: websocket\x0d\x0a""Connection: Upgrade\x0d\x0a""Sec-WebSocket-Key: ");
+       strcpy(p, key_b64);
+       p += strlen(key_b64);
+       p += sprintf(p, "\x0d\x0a");
+       if (lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_ORIGIN))
+               p += sprintf(p, "Origin: %s\x0d\x0a",
+                            lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_ORIGIN));
+
+       if (lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_SENT_PROTOCOLS))
+               p += sprintf(p, "Sec-WebSocket-Protocol: %s\x0d\x0a",
+                    lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_SENT_PROTOCOLS));
+
+       /* tell the server what extensions we could support */
+
+       p += sprintf(p, "Sec-WebSocket-Extensions: ");
+#ifndef LWS_NO_EXTENSIONS
+       ext = context->extensions;
+       while (ext && ext->callback) {
+
+               n = 0;
+               ext1 = context->extensions;
+
+               while (ext1 && ext1->callback) {
+                       n |= ext1->callback(context, ext1, wsi,
+                               LWS_EXT_CALLBACK_CHECK_OK_TO_PROPOSE_EXTENSION,
+                                       NULL, (char *)ext->name, 0);
+
+                       ext1++;
+               }
+
+               if (n) { /* an extension vetos us */
+                       lwsl_ext("ext %s vetoed\n", (char *)ext->name);
+                       ext++;
+                       continue;
+               }
+
+               n = context->protocols[0].callback(context, wsi,
+                       LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED,
+                               wsi->user_space, (char *)ext->name, 0);
+
+               /*
+                * zero return from callback means
+                * go ahead and allow the extension,
+                * it's what we get if the callback is
+                * unhandled
+                */
+
+               if (n) {
+                       ext++;
+                       continue;
+               }
+
+               /* apply it */
+
+               if (ext_count)
+                       *p++ = ',';
+               p += sprintf(p, "%s", ext->name);
+               ext_count++;
+
+               ext++;
+       }
+#endif
+       p += sprintf(p, "\x0d\x0a");
+
+       if (wsi->ietf_spec_revision)
+               p += sprintf(p, "Sec-WebSocket-Version: %d\x0d\x0a",
+                                              wsi->ietf_spec_revision);
+
+       /* give userland a chance to append, eg, cookies */
+
+       context->protocols[0].callback(context, wsi,
+               LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER,
+               NULL, &p, (pkt + sizeof(context->service_buffer)) - p - 12);
+
+       p += sprintf(p, "\x0d\x0a");
+
+       /* prepare the expected server accept response */
+
+       key_b64[39] = '\0'; /* enforce composed length below buf sizeof */
+       n = sprintf(buf, "%s258EAFA5-E914-47DA-95CA-C5AB0DC85B11", key_b64);
+
+       SHA1((unsigned char *)buf, n, (unsigned char *)hash);
+
+       lws_b64_encode_string(hash, 20,
+                       wsi->u.hdr.ah->initial_handshake_hash_base64,
+                         sizeof(wsi->u.hdr.ah->initial_handshake_hash_base64));
+
+       return p;
+}
+
diff --git a/lib/daemonize.c b/lib/daemonize.c
new file mode 100644 (file)
index 0000000..5e3af8e
--- /dev/null
@@ -0,0 +1,220 @@
+/*
+ * This code is mainly taken from Doug Potter's page
+ *
+ * http://www-theorie.physik.unizh.ch/~dpotter/howto/daemonize
+ *
+ * I contacted him 2007-04-16 about the license for the original code,
+ * he replied it is Public Domain.  Use the URL above to get the original
+ * Public Domain version if you want it.
+ *
+ * This version is LGPL2 and is (c)2006 - 2013 Andy Green <andy@warmcat.com>
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <unistd.h>
+#include <errno.h>
+
+int pid_daemon;
+static char *lock_path;
+
+int get_daemonize_pid()
+{
+       return pid_daemon;
+}
+
+static void
+child_handler(int signum)
+{
+       int fd;
+       int len;
+       int sent;
+       char sz[20];
+
+       switch (signum) {
+
+       case SIGALRM: /* timedout daemonizing */
+               exit(1);
+               break;
+
+       case SIGUSR1: /* positive confirmation we daemonized well */
+               /* Create the lock file as the current user */
+
+               fd = open(lock_path, O_TRUNC | O_RDWR | O_CREAT, 0640);
+               if (fd < 0) {
+                       fprintf(stderr,
+                          "unable to create lock file %s, code=%d (%s)\n",
+                               lock_path, errno, strerror(errno));
+                       exit(1);
+               }
+               len = sprintf(sz, "%u", pid_daemon);
+               sent = write(fd, sz, len);
+               if (sent != len)
+                       fprintf(stderr,
+                         "unable write pid to lock file %s, code=%d (%s)\n",
+                                            lock_path, errno, strerror(errno));
+
+               close(fd);
+               exit(!!(sent == len));
+
+       case SIGCHLD: /* daemonization failed */
+               exit(1);
+               break;
+       }
+}
+
+static void lws_daemon_closing(int sigact)
+{
+       if (getpid() == pid_daemon)
+               if (lock_path) {
+                       unlink(lock_path);
+                       free(lock_path);
+                       lock_path = NULL;
+               }
+
+       kill(getpid(), SIGKILL);
+}
+
+/*
+ * You just need to call this from your main(), when it
+ * returns you are all set "in the background" decoupled
+ * from the console you were started from.
+ *
+ * The process context you called from has been terminated then.
+ */
+
+int
+lws_daemonize(const char *_lock_path)
+{
+       pid_t sid, parent;
+       int fd;
+       char buf[10];
+       int n, ret;
+       struct sigaction act;
+
+       /* already a daemon */
+       if (getppid() == 1)
+               return 1;
+
+       fd = open(_lock_path, O_RDONLY);
+       if (fd > 0) {
+               n = read(fd, buf, sizeof(buf));
+               close(fd);
+               if (n) {
+                       n = atoi(buf);
+                       ret = kill(n, 0);
+                       if (ret >= 0) {
+                               fprintf(stderr,
+                                    "Daemon already running from pid %d\n", n);
+                               exit(1);
+                       }
+                       fprintf(stderr,
+                           "Removing stale lock file %s from dead pid %d\n",
+                                                                _lock_path, n);
+                       unlink(lock_path);
+               }
+       }
+
+       n = strlen(_lock_path) + 1;
+       lock_path = malloc(n);
+       if (!lock_path) {
+               fprintf(stderr, "Out of mem in lws_daemonize\n");
+               return 1;
+       }
+       strcpy(lock_path, _lock_path);
+
+       /* Trap signals that we expect to recieve */
+       signal(SIGCHLD, child_handler); /* died */
+       signal(SIGUSR1, child_handler); /* was happy */
+       signal(SIGALRM, child_handler); /* timeout daemonizing */
+
+       /* Fork off the parent process */
+       pid_daemon = fork();
+       if (pid_daemon < 0) {
+               fprintf(stderr, "unable to fork daemon, code=%d (%s)",
+                   errno, strerror(errno));
+               exit(1);
+       }
+
+       /* If we got a good PID, then we can exit the parent process. */
+       if (pid_daemon > 0) {
+
+               /*
+                * Wait for confirmation signal from the child via
+                * SIGCHILD / USR1, or for two seconds to elapse
+                * (SIGALRM).  pause() should not return.
+                */
+               alarm(2);
+
+               pause();
+               /* should not be reachable */
+               exit(1);
+       }
+
+       /* At this point we are executing as the child process */
+       parent = getppid();
+       pid_daemon = getpid();
+
+       /* Cancel certain signals */
+       signal(SIGCHLD, SIG_DFL); /* A child process dies */
+       signal(SIGTSTP, SIG_IGN); /* Various TTY signals */
+       signal(SIGTTOU, SIG_IGN);
+       signal(SIGTTIN, SIG_IGN);
+       signal(SIGHUP, SIG_IGN); /* Ignore hangup signal */
+
+       /* Change the file mode mask */
+       umask(0);
+
+       /* Create a new SID for the child process */
+       sid = setsid();
+       if (sid < 0) {
+               fprintf(stderr,
+                       "unable to create a new session, code %d (%s)",
+                       errno, strerror(errno));
+               exit(1);
+       }
+
+       /*
+        * Change the current working directory.  This prevents the current
+        * directory from being locked; hence not being able to remove it.
+        */
+       if (chdir("/") < 0) {
+               fprintf(stderr,
+                       "unable to change directory to %s, code %d (%s)",
+                       "/", errno, strerror(errno));
+               exit(1);
+       }
+
+       /* Redirect standard files to /dev/null */
+       if (!freopen("/dev/null", "r", stdin))
+               fprintf(stderr, "unable to freopen() stdin, code %d (%s)",
+                                                      errno, strerror(errno));
+
+       if (!freopen("/dev/null", "w", stdout))
+               fprintf(stderr, "unable to freopen() stdout, code %d (%s)",
+                                                      errno, strerror(errno));
+
+       if (!freopen("/dev/null", "w", stderr))
+               fprintf(stderr, "unable to freopen() stderr, code %d (%s)",
+                                                      errno, strerror(errno));
+
+       /* Tell the parent process that we are A-okay */
+       kill(parent, SIGUSR1);
+
+       act.sa_handler = lws_daemon_closing;
+       sigemptyset(&act.sa_mask);
+       act.sa_flags = 0;
+
+       sigaction(SIGTERM, &act, NULL);
+
+       /* return to continue what is now "the daemon" */
+
+       return 0;
+}
+
diff --git a/lib/extension-deflate-frame.c b/lib/extension-deflate-frame.c
new file mode 100644 (file)
index 0000000..b206476
--- /dev/null
@@ -0,0 +1,294 @@
+#include "private-libwebsockets.h"
+#include "extension-deflate-frame.h"
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#define LWS_ZLIB_WINDOW_BITS 15
+#define LWS_ZLIB_MEMLEVEL 8
+
+int lws_extension_callback_deflate_frame(
+               struct libwebsocket_context *context,
+               struct libwebsocket_extension *ext,
+               struct libwebsocket *wsi,
+               enum libwebsocket_extension_callback_reasons reason,
+               void *user, void *in, size_t len)
+{
+       struct lws_ext_deflate_frame_conn *conn =
+                                    (struct lws_ext_deflate_frame_conn *)user;
+       struct lws_tokens *eff_buf = (struct lws_tokens *)in;
+       size_t current_payload, remaining_payload, total_payload;
+       int n;
+       size_t len_so_far;
+
+       switch (reason) {
+
+       /*
+        * for deflate-frame, both client and server sides act the same
+        */
+
+       case LWS_EXT_CALLBACK_CLIENT_CONSTRUCT:
+       case LWS_EXT_CALLBACK_CONSTRUCT:
+               conn->zs_in.zalloc = conn->zs_out.zalloc = Z_NULL;
+               conn->zs_in.zfree = conn->zs_out.zfree = Z_NULL;
+               conn->zs_in.opaque = conn->zs_out.opaque = Z_NULL;
+               n = inflateInit2(&conn->zs_in, -LWS_ZLIB_WINDOW_BITS);
+               if (n != Z_OK) {
+                       lwsl_ext("deflateInit returned %d\n", n);
+                       return 1;
+               }
+               n = deflateInit2(&conn->zs_out,
+                                (context->listen_port ?
+                                       DEFLATE_FRAME_COMPRESSION_LEVEL_SERVER :
+                                       DEFLATE_FRAME_COMPRESSION_LEVEL_CLIENT),
+                                Z_DEFLATED,
+                                -LWS_ZLIB_WINDOW_BITS, LWS_ZLIB_MEMLEVEL,
+                                Z_DEFAULT_STRATEGY);
+               if (n != Z_OK) {
+                       lwsl_ext("deflateInit2 returned %d\n", n);
+                       return 1;
+               }
+               conn->buf_pre_used = 0;
+               conn->buf_pre_length = 0;
+               conn->buf_in_length = sizeof(conn->buf_in);
+               conn->buf_out_length = sizeof(conn->buf_out);
+               conn->compressed_out = 0;
+               conn->buf_pre = NULL;
+               conn->buf_in = (unsigned char *)
+                               malloc(LWS_SEND_BUFFER_PRE_PADDING +
+                                              conn->buf_in_length +
+                                              LWS_SEND_BUFFER_POST_PADDING);
+               if (!conn->buf_in)
+                       goto bail;
+               conn->buf_out = (unsigned char *)
+                               malloc(LWS_SEND_BUFFER_PRE_PADDING +
+                                               conn->buf_out_length +
+                                               LWS_SEND_BUFFER_POST_PADDING);
+               if (!conn->buf_out)
+                       goto bail;
+               lwsl_ext("zlibs constructed\n");
+               break;
+bail:
+               lwsl_err("Out of mem\n");
+               (void)inflateEnd(&conn->zs_in);
+               (void)deflateEnd(&conn->zs_out);
+               return -1;
+
+       case LWS_EXT_CALLBACK_DESTROY:
+               if (conn->buf_pre)
+                       free(conn->buf_pre);
+               free(conn->buf_in);
+               free(conn->buf_out);
+               conn->buf_pre_used = 0;
+               conn->buf_pre_length = 0;
+               conn->buf_in_length = 0;
+               conn->buf_out_length = 0;
+               conn->compressed_out = 0;
+               (void)inflateEnd(&conn->zs_in);
+               (void)deflateEnd(&conn->zs_out);
+               lwsl_ext("zlibs destructed\n");
+               break;
+
+       case LWS_EXT_CALLBACK_PAYLOAD_RX:
+               if (!(wsi->u.ws.rsv & 0x40))
+                       return 0;
+
+               /*
+                * inflate the incoming payload
+                */
+               current_payload = eff_buf->token_len;
+
+               remaining_payload = wsi->u.ws.rx_packet_length;
+               if (remaining_payload) {
+                       total_payload = conn->buf_pre_used +
+                                       current_payload +
+                                       remaining_payload;
+
+                       if (conn->buf_pre_length < total_payload) {
+                               conn->buf_pre_length = total_payload;
+                               if (conn->buf_pre)
+                                       free(conn->buf_pre);
+                               conn->buf_pre =
+                                   (unsigned char *)malloc(total_payload + 4);
+                               if (!conn->buf_pre) {
+                                       lwsl_err("Out of memory\n");
+                                       return -1;
+                               }
+                       }
+
+                       memcpy(conn->buf_pre + conn->buf_pre_used,
+                                             eff_buf->token, current_payload);
+                       conn->buf_pre_used += current_payload;
+
+                       eff_buf->token = NULL;
+                       eff_buf->token_len = 0;
+
+                       return 0;
+               }
+               if (conn->buf_pre_used) {
+                       total_payload = conn->buf_pre_used +
+                                       current_payload;
+
+                       memcpy(conn->buf_pre + conn->buf_pre_used,
+                                             eff_buf->token, current_payload);
+                       conn->buf_pre_used = 0;
+
+                       conn->zs_in.next_in = conn->buf_pre;
+               } else {
+                       total_payload = current_payload;
+
+                       conn->zs_in.next_in = (unsigned char *)eff_buf->token;
+               }
+
+               conn->zs_in.next_in[total_payload + 0] = 0;
+               conn->zs_in.next_in[total_payload + 1] = 0;
+               conn->zs_in.next_in[total_payload + 2] = 0xff;
+               conn->zs_in.next_in[total_payload + 3] = 0xff;
+
+               conn->zs_in.avail_in = total_payload + 4;
+
+               conn->zs_in.next_out =
+                               conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING;
+               conn->zs_in.avail_out = conn->buf_in_length;
+
+               while (1) {
+                       n = inflate(&conn->zs_in, Z_SYNC_FLUSH);
+                       switch (n) {
+                       case Z_NEED_DICT:
+                       case Z_STREAM_ERROR:
+                       case Z_DATA_ERROR:
+                       case Z_MEM_ERROR:
+                               /*
+                                * screwed.. close the connection...
+                                * we will get a destroy callback to take care
+                                * of closing nicely
+                                */
+                               lwsl_err("zlib error inflate %d: %s\n",
+                                                          n, conn->zs_in.msg);
+                               return -1;
+                       }
+
+                       if (conn->zs_in.avail_out)
+                               break;
+
+                       len_so_far = conn->zs_in.next_out -
+                               (conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING);
+
+                       conn->buf_in_length *= 2;
+                       if (conn->buf_in_length > LWS_MAX_ZLIB_CONN_BUFFER) {
+                               lwsl_ext("zlib in buffer hit limit %u\n",
+                                               LWS_MAX_ZLIB_CONN_BUFFER);
+                               return -1;
+                       }
+                       conn->buf_in = (unsigned char *)realloc(conn->buf_in,
+                                       LWS_SEND_BUFFER_PRE_PADDING +
+                                               conn->buf_in_length +
+                                                LWS_SEND_BUFFER_POST_PADDING);
+                       if (!conn->buf_in) {
+                               lwsl_err("Out of memory\n");
+                               return -1;
+                       }
+                       lwsl_debug(
+                               "deflate-frame ext RX did realloc to %ld\n",
+                                       conn->buf_in_length);
+                       conn->zs_in.next_out = conn->buf_in +
+                               LWS_SEND_BUFFER_PRE_PADDING + len_so_far;
+                       conn->zs_in.avail_out =
+                                       conn->buf_in_length - len_so_far;
+               }
+
+               /* rewrite the buffer pointers and length */
+               eff_buf->token =
+                       (char *)(conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING);
+               eff_buf->token_len = (int)(conn->zs_in.next_out -
+                                (conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING));
+
+               return 0;
+
+       case LWS_EXT_CALLBACK_PAYLOAD_TX:
+               /*
+                * deflate the outgoing payload
+                */
+               current_payload = eff_buf->token_len;
+
+               conn->zs_out.next_in = (unsigned char *)eff_buf->token;
+               conn->zs_out.avail_in = current_payload;
+
+               conn->zs_out.next_out =
+                               conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING;
+               conn->zs_out.avail_out = conn->buf_out_length;
+
+               while (1) {
+                       n = deflate(&conn->zs_out, Z_SYNC_FLUSH);
+                       if (n == Z_STREAM_ERROR) {
+                               /*
+                                * screwed.. close the connection... we will
+                                * get a destroy callback to take care of
+                                * closing nicely
+                                */
+                               lwsl_ext("zlib error deflate\n");
+
+                               return -1;
+                       }
+
+                       if (conn->zs_out.avail_out)
+                               break;
+
+                       len_so_far = (conn->zs_out.next_out -
+                                       (conn->buf_out +
+                                                LWS_SEND_BUFFER_PRE_PADDING));
+                       conn->buf_out_length *= 2;
+                       if (conn->buf_out_length > LWS_MAX_ZLIB_CONN_BUFFER) {
+                               lwsl_ext("zlib out hit limit %u\n",
+                                               LWS_MAX_ZLIB_CONN_BUFFER);
+                               return -1;
+                       }
+                       conn->buf_out = (unsigned char *)realloc(
+                                       conn->buf_out,
+                                       LWS_SEND_BUFFER_PRE_PADDING +
+                                                 conn->buf_out_length +
+                                                 LWS_SEND_BUFFER_POST_PADDING);
+                       if (!conn->buf_out) {
+                               lwsl_err("Out of memory\n");
+                               return -1;
+                       }
+                       lwsl_debug(
+                               "deflate-frame ext TX did realloc to %ld\n",
+                                       conn->buf_in_length);
+
+                       conn->zs_out.next_out = (conn->buf_out +
+                                    LWS_SEND_BUFFER_PRE_PADDING + len_so_far);
+                       conn->zs_out.avail_out =
+                                          (conn->buf_out_length - len_so_far);
+               }
+
+               conn->compressed_out = 1;
+
+               /* rewrite the buffer pointers and length */
+               eff_buf->token = (char *)(conn->buf_out +
+                                               LWS_SEND_BUFFER_PRE_PADDING);
+               eff_buf->token_len = (int)(conn->zs_out.next_out -
+                           (conn->buf_out + LWS_SEND_BUFFER_PRE_PADDING)) - 4;
+
+               return 0;
+
+       case LWS_EXT_CALLBACK_PACKET_TX_PRESEND:
+               if (conn->compressed_out) {
+                       conn->compressed_out = 0;
+                       *((unsigned char *)eff_buf->token) |= 0x40;
+               }
+               break;
+
+       case LWS_EXT_CALLBACK_CHECK_OK_TO_PROPOSE_EXTENSION:
+               /* Avoid x-webkit-deflate-frame extension on client */
+               if (!strcmp((char *)in, "x-webkit-deflate-frame"))
+                       return 1;
+               break;
+
+       default:
+               break;
+       }
+
+       return 0;
+}
+
diff --git a/lib/extension-deflate-frame.h b/lib/extension-deflate-frame.h
new file mode 100644 (file)
index 0000000..00a4447
--- /dev/null
@@ -0,0 +1,25 @@
+
+#include <zlib.h>
+
+#define DEFLATE_FRAME_COMPRESSION_LEVEL_SERVER 1
+#define DEFLATE_FRAME_COMPRESSION_LEVEL_CLIENT Z_DEFAULT_COMPRESSION
+
+struct lws_ext_deflate_frame_conn {
+       z_stream zs_in;
+       z_stream zs_out;
+       size_t buf_pre_used;
+       size_t buf_pre_length;
+       size_t buf_in_length;
+       size_t buf_out_length;
+       int compressed_out;
+       unsigned char *buf_pre;
+       unsigned char *buf_in;
+       unsigned char *buf_out;
+};
+
+extern int lws_extension_callback_deflate_frame(
+               struct libwebsocket_context *context,
+               struct libwebsocket_extension *ext,
+               struct libwebsocket *wsi,
+               enum libwebsocket_extension_callback_reasons reason,
+               void *user, void *in, size_t len);
diff --git a/lib/extension-deflate-stream.c b/lib/extension-deflate-stream.c
new file mode 100644 (file)
index 0000000..addaa2c
--- /dev/null
@@ -0,0 +1,166 @@
+#include "private-libwebsockets.h"
+#include "extension-deflate-stream.h"
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#define LWS_ZLIB_WINDOW_BITS 15
+#define LWS_ZLIB_MEMLEVEL 8
+
+int lws_extension_callback_deflate_stream(
+               struct libwebsocket_context *context,
+               struct libwebsocket_extension *ext,
+               struct libwebsocket *wsi,
+                       enum libwebsocket_extension_callback_reasons reason,
+                                              void *user, void *in, size_t len)
+{
+       struct lws_ext_deflate_stream_conn *conn =
+                                    (struct lws_ext_deflate_stream_conn *)user;
+       int n;
+       struct lws_tokens *eff_buf = (struct lws_tokens *)in;
+
+       switch (reason) {
+
+       /*
+        * for deflate-stream, both client and server sides act the same
+        */
+
+       case LWS_EXT_CALLBACK_CLIENT_CONSTRUCT:
+       case LWS_EXT_CALLBACK_CONSTRUCT:
+               conn->zs_in.zalloc = conn->zs_out.zalloc = Z_NULL;
+               conn->zs_in.zfree = conn->zs_out.zfree = Z_NULL;
+               conn->zs_in.opaque = conn->zs_out.opaque = Z_NULL;
+               n = inflateInit2(&conn->zs_in, -LWS_ZLIB_WINDOW_BITS);
+               if (n != Z_OK) {
+                       lwsl_err("deflateInit returned %d\n", n);
+                       return 1;
+               }
+               n = deflateInit2(&conn->zs_out,
+                                DEFLATE_STREAM_COMPRESSION_LEVEL, Z_DEFLATED,
+                                -LWS_ZLIB_WINDOW_BITS, LWS_ZLIB_MEMLEVEL,
+                                                           Z_DEFAULT_STRATEGY);
+               if (n != Z_OK) {
+                       lwsl_err("deflateInit returned %d\n", n);
+                       return 1;
+               }
+               lwsl_ext("zlibs constructed\n");
+               conn->remaining_in = 0;
+               break;
+
+       case LWS_EXT_CALLBACK_DESTROY:
+               (void)inflateEnd(&conn->zs_in);
+               (void)deflateEnd(&conn->zs_out);
+               lwsl_ext("zlibs destructed\n");
+               break;
+
+       case LWS_EXT_CALLBACK_PACKET_RX_PREPARSE:
+
+               /*
+                * inflate the incoming compressed data
+                * Notice, length may be 0 and pointer NULL
+                * in the case we are flushing with nothing new coming in
+                */
+               if (conn->remaining_in) {
+                       conn->zs_in.next_in = conn->buf_in;
+                       conn->zs_in.avail_in = conn->remaining_in;
+                       conn->remaining_in = 0;
+               } else {
+                       conn->zs_in.next_in = (unsigned char *)eff_buf->token;
+                       conn->zs_in.avail_in = eff_buf->token_len;
+               }
+
+               conn->zs_in.next_out = conn->buf_out;
+               conn->zs_in.avail_out = sizeof(conn->buf_out);
+
+               n = inflate(&conn->zs_in, Z_SYNC_FLUSH);
+               switch (n) {
+               case Z_NEED_DICT:
+               case Z_DATA_ERROR:
+               case Z_MEM_ERROR:
+                       /*
+                        * screwed.. close the connection... we will get a
+                        * destroy callback to take care of closing nicely
+                        */
+                       lwsl_err("zlib error inflate %d\n", n);
+                       return -1;
+               }
+
+               /* rewrite the buffer pointers and length */
+
+               eff_buf->token = (char *)conn->buf_out;
+               eff_buf->token_len =
+                       sizeof(conn->buf_out) - conn->zs_in.avail_out;
+
+               /* copy avail data if not consumed */
+               if (conn->zs_in.avail_in > 0) {
+                       conn->remaining_in = conn->zs_in.avail_in;
+                       memcpy(conn->buf_in, conn->zs_in.next_in,
+                                                       conn->zs_in.avail_in);
+                       return 1;
+               }
+
+               /*
+                * if we filled the output buffer, signal that we likely have
+                * more and need to be called again
+                */
+
+               if (eff_buf->token_len == sizeof(conn->buf_out))
+                       return 1;
+
+               /* we don't need calling again until new input data comes */
+
+               return 0;
+
+       case LWS_EXT_CALLBACK_FLUSH_PENDING_TX:
+       case LWS_EXT_CALLBACK_PACKET_TX_PRESEND:
+
+               /*
+                * deflate the outgoing compressed data
+                */
+
+               conn->zs_out.next_in = (unsigned char *)eff_buf->token;
+               conn->zs_out.avail_in = eff_buf->token_len;
+
+               conn->zs_out.next_out = conn->buf_out;
+               conn->zs_out.avail_out = sizeof(conn->buf_out);
+
+               n = Z_PARTIAL_FLUSH;
+               if (reason == LWS_EXT_CALLBACK_FLUSH_PENDING_TX)
+                       n = Z_FULL_FLUSH;
+
+               n = deflate(&conn->zs_out, n);
+               if (n == Z_STREAM_ERROR) {
+                       /*
+                        * screwed.. close the connection... we will get a
+                        * destroy callback to take care of closing nicely
+                        */
+                       lwsl_ext("zlib error deflate\n");
+
+                       return -1;
+               }
+
+               /* rewrite the buffer pointers and length */
+
+               eff_buf->token = (char *)conn->buf_out;
+               eff_buf->token_len =
+                               sizeof(conn->buf_out) - conn->zs_out.avail_out;
+
+               /*
+                * if we filled the output buffer, signal that we likely have
+                * more and need to be called again... even in deflate case
+                * we might sometimes need to spill more than came in
+                */
+
+               if (eff_buf->token_len == sizeof(conn->buf_out))
+                       return 1;
+
+               /* we don't need calling again until new input data comes */
+
+               return 0;
+
+       default:
+               break;
+       }
+
+       return 0;
+}
diff --git a/lib/extension-deflate-stream.h b/lib/extension-deflate-stream.h
new file mode 100644 (file)
index 0000000..fcadc07
--- /dev/null
@@ -0,0 +1,20 @@
+
+#include <zlib.h>
+
+#define DEFLATE_STREAM_CHUNK 128
+#define DEFLATE_STREAM_COMPRESSION_LEVEL 1
+
+struct lws_ext_deflate_stream_conn {
+       z_stream zs_in;
+       z_stream zs_out;
+       int remaining_in;
+       unsigned char buf_in[LWS_MAX_SOCKET_IO_BUF];
+       unsigned char buf_out[LWS_MAX_SOCKET_IO_BUF];
+};
+
+extern int lws_extension_callback_deflate_stream(
+               struct libwebsocket_context *context,
+               struct libwebsocket_extension *ext,
+               struct libwebsocket *wsi,
+               enum libwebsocket_extension_callback_reasons reason,
+                                             void *user, void *in, size_t len);
diff --git a/lib/extension.c b/lib/extension.c
new file mode 100644 (file)
index 0000000..3d255b3
--- /dev/null
@@ -0,0 +1,33 @@
+#include "private-libwebsockets.h"
+
+#include "extension-deflate-frame.h"
+#include "extension-deflate-stream.h"
+
+struct libwebsocket_extension libwebsocket_internal_extensions[] = {
+#ifdef LWS_EXT_DEFLATE_STREAM
+       {
+               "deflate-stream",
+               lws_extension_callback_deflate_stream,
+               sizeof(struct lws_ext_deflate_stream_conn)
+       },
+#else
+       {
+               "x-webkit-deflate-frame",
+               lws_extension_callback_deflate_frame,
+               sizeof(struct lws_ext_deflate_frame_conn)
+       },
+       {
+               "deflate-frame",
+               lws_extension_callback_deflate_frame,
+               sizeof(struct lws_ext_deflate_frame_conn)
+       },
+#endif
+       { /* terminator */
+               NULL, NULL, 0
+       }
+};
+
+struct libwebsocket_extension *libwebsocket_get_internal_extensions()
+{
+       return libwebsocket_internal_extensions;
+}
diff --git a/lib/getifaddrs.c b/lib/getifaddrs.c
new file mode 100644 (file)
index 0000000..1fa47ce
--- /dev/null
@@ -0,0 +1,276 @@
+/*
+ * downloaded from
+ * http://ftp.uninett.no/pub/OpenBSD/src/kerberosV/src/lib/roken/getifaddrs.c
+ */
+#if !HAVE_GETIFADDRS
+/*
+ * Copyright (c) 2000 - 2001 Kungliga Tekniska H�gskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
+#ifdef HAVE_NETINET_IN6_VAR_H
+#include <netinet/in6_var.h>
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+#include "getifaddrs.h"
+
+static int
+getifaddrs2(struct ifaddrs **ifap,
+           int af, int siocgifconf, int siocgifflags,
+           size_t ifreq_sz)
+{
+       int ret;
+       int fd;
+       size_t buf_size;
+       char *buf;
+       struct ifconf ifconf;
+       char *p;
+       size_t sz;
+       struct sockaddr sa_zero;
+       struct ifreq *ifr;
+
+       struct ifaddrs *start,  **end = &start;
+
+       buf = NULL;
+
+       memset(&sa_zero, 0, sizeof(sa_zero));
+       fd = socket(af, SOCK_DGRAM, 0);
+       if (fd < 0)
+               return -1;
+
+       buf_size = 8192;
+       for (;;) {
+               buf = calloc(1, buf_size);
+               if (buf == NULL) {
+                       ret = ENOMEM;
+                       goto error_out;
+               }
+               ifconf.ifc_len = buf_size;
+               ifconf.ifc_buf = buf;
+
+               /*
+                * Solaris returns EINVAL when the buffer is too small.
+                */
+               if (ioctl(fd, siocgifconf, &ifconf) < 0 && errno != EINVAL) {
+                       ret = errno;
+                       goto error_out;
+               }
+               /*
+                * Can the difference between a full and a overfull buf
+                * be determined?
+                */
+
+               if (ifconf.ifc_len < (int)buf_size)
+                       break;
+               free(buf);
+               buf_size *= 2;
+       }
+
+       for (p = ifconf.ifc_buf; p < ifconf.ifc_buf + ifconf.ifc_len; p += sz) {
+               struct ifreq ifreq;
+               struct sockaddr *sa;
+               size_t salen;
+
+               ifr = (struct ifreq *)p;
+               sa  = &ifr->ifr_addr;
+
+               sz = ifreq_sz;
+               salen = sizeof(struct sockaddr);
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+               salen = sa->sa_len;
+               sz = max(sz, sizeof(ifr->ifr_name) + sa->sa_len);
+#endif
+#ifdef SA_LEN
+               salen = SA_LEN(sa);
+               sz = max(sz, sizeof(ifr->ifr_name) + SA_LEN(sa));
+#endif
+               memset(&ifreq, 0, sizeof(ifreq));
+               memcpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
+
+               if (ioctl(fd, siocgifflags, &ifreq) < 0) {
+                       ret = errno;
+                       goto error_out;
+               }
+
+               *end = malloc(sizeof(**end));
+
+               (*end)->ifa_next = NULL;
+               (*end)->ifa_name = strdup(ifr->ifr_name);
+               (*end)->ifa_flags = ifreq.ifr_flags;
+               (*end)->ifa_addr = malloc(salen);
+               memcpy((*end)->ifa_addr, sa, salen);
+               (*end)->ifa_netmask = NULL;
+
+#if 0
+               /* fix these when we actually need them */
+               if (ifreq.ifr_flags & IFF_BROADCAST) {
+                       (*end)->ifa_broadaddr =
+                               malloc(sizeof(ifr->ifr_broadaddr));
+                       memcpy((*end)->ifa_broadaddr, &ifr->ifr_broadaddr,
+                                                   sizeof(ifr->ifr_broadaddr));
+               } else if (ifreq.ifr_flags & IFF_POINTOPOINT) {
+                       (*end)->ifa_dstaddr = malloc(sizeof(ifr->ifr_dstaddr));
+                       memcpy((*end)->ifa_dstaddr, &ifr->ifr_dstaddr,
+                                                     sizeof(ifr->ifr_dstaddr));
+               } else
+                       (*end)->ifa_dstaddr = NULL;
+#else
+               (*end)->ifa_dstaddr = NULL;
+#endif
+               (*end)->ifa_data = NULL;
+
+               end = &(*end)->ifa_next;
+
+       }
+       *ifap = start;
+       close(fd);
+       free(buf);
+       return 0;
+
+error_out:
+       close(fd);
+       free(buf);
+       errno = ret;
+
+       return -1;
+}
+
+int
+getifaddrs(struct ifaddrs **ifap)
+{
+       int ret = -1;
+       errno = ENXIO;
+#if defined(AF_INET6) && defined(SIOCGIF6CONF) && defined(SIOCGIF6FLAGS)
+       if (ret)
+               ret = getifaddrs2(ifap, AF_INET6, SIOCGIF6CONF, SIOCGIF6FLAGS,
+                          sizeof(struct in6_ifreq));
+#endif
+#if defined(HAVE_IPV6) && defined(SIOCGIFCONF)
+       if (ret)
+               ret = getifaddrs2(ifap, AF_INET6, SIOCGIFCONF, SIOCGIFFLAGS,
+                          sizeof(struct ifreq));
+#endif
+#if defined(AF_INET) && defined(SIOCGIFCONF) && defined(SIOCGIFFLAGS)
+       if (ret)
+               ret = getifaddrs2(ifap, AF_INET, SIOCGIFCONF, SIOCGIFFLAGS,
+                          sizeof(struct ifreq));
+#endif
+       return ret;
+}
+
+void
+freeifaddrs(struct ifaddrs *ifp)
+{
+       struct ifaddrs *p, *q;
+
+       for (p = ifp; p; ) {
+               free(p->ifa_name);
+               if (p->ifa_addr)
+                       free(p->ifa_addr);
+               if (p->ifa_dstaddr)
+                       free(p->ifa_dstaddr);
+               if (p->ifa_netmask)
+                       free(p->ifa_netmask);
+               if (p->ifa_data)
+                       free(p->ifa_data);
+               q = p;
+               p = p->ifa_next;
+               free(q);
+       }
+}
+
+#ifdef TEST
+
+void
+print_addr(const char *s, struct sockaddr *sa)
+{
+       int i;
+       printf("  %s=%d/", s, sa->sa_family);
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+       for (i = 0;
+              i < sa->sa_len - ((long)sa->sa_data - (long)&sa->sa_family); i++)
+               printf("%02x", ((unsigned char *)sa->sa_data)[i]);
+#else
+       for (i = 0; i < sizeof(sa->sa_data); i++)
+               printf("%02x", ((unsigned char *)sa->sa_data)[i]);
+#endif
+       printf("\n");
+}
+
+void
+print_ifaddrs(struct ifaddrs *x)
+{
+       struct ifaddrs *p;
+
+       for (p = x; p; p = p->ifa_next) {
+               printf("%s\n", p->ifa_name);
+               printf("  flags=%x\n", p->ifa_flags);
+               if (p->ifa_addr)
+                       print_addr("addr", p->ifa_addr);
+               if (p->ifa_dstaddr)
+                       print_addr("dstaddr", p->ifa_dstaddr);
+               if (p->ifa_netmask)
+                       print_addr("netmask", p->ifa_netmask);
+               printf("  %p\n", p->ifa_data);
+       }
+}
+
+int
+main()
+{
+       struct ifaddrs *a = NULL, *b;
+       getifaddrs2(&a, AF_INET, SIOCGIFCONF,
+                               SIOCGIFFLAGS, sizeof(struct ifreq));
+       print_ifaddrs(a);
+       printf("---\n");
+       getifaddrs(&b);
+       print_ifaddrs(b);
+       return 0;
+}
+#endif
+#endif
diff --git a/lib/getifaddrs.h b/lib/getifaddrs.h
new file mode 100644 (file)
index 0000000..7871932
--- /dev/null
@@ -0,0 +1,76 @@
+#if HAVE_GETIFADDRS
+#include <sys/types.h>
+#include <ifaddrs.h>
+#else
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Copyright (c) 2000 Kungliga Tekniska H�gskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* $KTH: ifaddrs.hin,v 1.3 2000/12/11 00:01:13 assar Exp $ */
+
+#ifndef __ifaddrs_h__
+#define __ifaddrs_h__
+
+/*
+ * the interface is defined in terms of the fields below, and this is
+ * sometimes #define'd, so there seems to be no simple way of solving
+ * this and this seemed the best. */
+
+#undef ifa_dstaddr
+
+struct ifaddrs {
+       struct ifaddrs *ifa_next;
+       char *ifa_name;
+       unsigned int ifa_flags;
+       struct sockaddr *ifa_addr;
+       struct sockaddr *ifa_netmask;
+       struct sockaddr *ifa_dstaddr;
+       void *ifa_data;
+};
+
+#ifndef ifa_broadaddr
+#define ifa_broadaddr ifa_dstaddr
+#endif
+
+int getifaddrs(struct ifaddrs **);
+
+void freeifaddrs(struct ifaddrs *);
+
+#endif /* __ifaddrs_h__ */
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/lib/handshake.c b/lib/handshake.c
new file mode 100644 (file)
index 0000000..50138dd
--- /dev/null
@@ -0,0 +1,309 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "private-libwebsockets.h"
+
+/*
+ * -04 of the protocol (actually the 80th version) has a radically different
+ * handshake.  The 04 spec gives the following idea
+ *
+ *    The handshake from the client looks as follows:
+ *
+ *      GET /chat HTTP/1.1
+ *      Host: server.example.com
+ *      Upgrade: websocket
+ *      Connection: Upgrade
+ *      Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
+ *      Sec-WebSocket-Origin: http://example.com
+ *      Sec-WebSocket-Protocol: chat, superchat
+ *     Sec-WebSocket-Version: 4
+ *
+ *  The handshake from the server looks as follows:
+ *
+ *       HTTP/1.1 101 Switching Protocols
+ *       Upgrade: websocket
+ *       Connection: Upgrade
+ *       Sec-WebSocket-Accept: me89jWimTRKTWwrS3aRrL53YZSo=
+ *       Sec-WebSocket-Nonce: AQIDBAUGBwgJCgsMDQ4PEC==
+ *       Sec-WebSocket-Protocol: chat
+ */
+
+/*
+ * We have to take care about parsing because the headers may be split
+ * into multiple fragments.  They may contain unknown headers with arbitrary
+ * argument lengths.  So, we parse using a single-character at a time state
+ * machine that is completely independent of packet size.
+ */
+
+int
+libwebsocket_read(struct libwebsocket_context *context,
+                    struct libwebsocket *wsi, unsigned char *buf, size_t len)
+{
+       size_t n;
+       struct allocated_headers *ah;
+       char *uri_ptr;
+       int uri_len;
+
+       switch (wsi->state) {
+       case WSI_STATE_HTTP_ISSUING_FILE:
+       case WSI_STATE_HTTP:
+               wsi->state = WSI_STATE_HTTP_HEADERS;
+               wsi->u.hdr.parser_state = WSI_TOKEN_NAME_PART;
+               wsi->u.hdr.lextable_pos = 0;
+               /* fallthru */
+       case WSI_STATE_HTTP_HEADERS:
+
+               lwsl_parser("issuing %d bytes to parser\n", (int)len);
+
+#ifndef LWS_NO_CLIENT
+               switch (wsi->mode) {
+               case LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY:
+               case LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE:
+               case LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY:
+               case LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT:
+               case LWS_CONNMODE_WS_CLIENT:
+                       for (n = 0; n < len; n++)
+                               if (libwebsocket_client_rx_sm(wsi, *buf++)) {
+                                       lwsl_info("client_rx_sm failed\n");
+                                       goto bail;
+                               }
+                       return 0;
+               default:
+                       break;
+               }
+#endif
+#ifndef LWS_NO_SERVER
+               /* LWS_CONNMODE_WS_SERVING */
+
+               for (n = 0; n < len; n++)
+                       if (libwebsocket_parse(wsi, *buf++)) {
+                               lwsl_info("libwebsocket_parse failed\n");
+                               goto bail;
+                       }
+
+               if (wsi->u.hdr.parser_state != WSI_PARSING_COMPLETE)
+                       break;
+
+               lwsl_parser("libwebsocket_parse sees parsing complete\n");
+
+               /* is this websocket protocol or normal http 1.0? */
+
+               if (!lws_hdr_total_length(wsi, WSI_TOKEN_UPGRADE) ||
+                            !lws_hdr_total_length(wsi, WSI_TOKEN_CONNECTION)) {
+
+                       /* it's not websocket.... shall we accept it as http? */
+
+                       if (!lws_hdr_total_length(wsi, WSI_TOKEN_GET_URI)) {
+                               lwsl_warn("Missing URI in HTTP request\n");
+                               /* drop the header info */
+                               if (wsi->u.hdr.ah)
+                                       free(wsi->u.hdr.ah);
+                               goto bail;
+                       }
+
+                       lwsl_info("HTTP request for '%s'\n",
+                               lws_hdr_simple_ptr(wsi, WSI_TOKEN_GET_URI));
+
+                       if (libwebsocket_ensure_user_space(wsi)) {
+                               /* drop the header info */
+                               if (wsi->u.hdr.ah)
+                                       free(wsi->u.hdr.ah);
+                               goto bail;
+                       }
+
+                       /*
+                        * Hm we still need the headers so the
+                        * callback can look at leaders like the URI, but we
+                        * need to transition to http union state.... hold a
+                        * copy of u.hdr.ah and deallocate afterwards
+                        */
+
+                       ah = wsi->u.hdr.ah;
+                       uri_ptr = lws_hdr_simple_ptr(wsi, WSI_TOKEN_GET_URI);
+                       uri_len = lws_hdr_total_length(wsi, WSI_TOKEN_GET_URI);
+
+                       /* union transition */
+                       memset(&wsi->u, 0, sizeof(wsi->u));
+
+                       wsi->state = WSI_STATE_HTTP;
+                       n = 0;
+                       if (wsi->protocol->callback)
+                               n = wsi->protocol->callback(context, wsi,
+                                   LWS_CALLBACK_HTTP,
+                                   wsi->user_space, uri_ptr, uri_len);
+
+                       /* now drop the header info we kept a pointer to */
+                       if (ah)
+                               free(ah);
+
+                       if (n) {
+                               lwsl_info("LWS_CALLBACK_HTTP closing\n");
+                               goto bail;
+                       }
+
+                       return 0;
+               }
+
+               if (!wsi->protocol)
+                       lwsl_err("NULL protocol at libwebsocket_read\n");
+
+               /*
+                * It's websocket
+                *
+                * Make sure user side is happy about protocol
+                */
+
+               while (wsi->protocol->callback) {
+
+                       if (!lws_hdr_total_length(wsi, WSI_TOKEN_PROTOCOL)) {
+                               if (wsi->protocol->name == NULL)
+                                       break;
+                       } else
+                               if (wsi->protocol->name && strcmp(
+                                       lws_hdr_simple_ptr(wsi,
+                                               WSI_TOKEN_PROTOCOL),
+                                                     wsi->protocol->name) == 0)
+                                       break;
+
+                       wsi->protocol++;
+               }
+
+               /* we didn't find a protocol he wanted? */
+
+               if (wsi->protocol->callback == NULL) {
+                       if (lws_hdr_simple_ptr(wsi, WSI_TOKEN_PROTOCOL) ==
+                                                                        NULL) {
+                               lwsl_info("no protocol -> prot 0 handler\n");
+                               wsi->protocol = &context->protocols[0];
+                       } else {
+                               lwsl_err("Req protocol %s not supported\n",
+                                  lws_hdr_simple_ptr(wsi, WSI_TOKEN_PROTOCOL));
+                               goto bail;
+                       }
+               }
+
+               /*
+                * Give the user code a chance to study the request and
+                * have the opportunity to deny it
+                */
+
+               if ((wsi->protocol->callback)(wsi->protocol->owning_server, wsi,
+                               LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION,
+                               lws_hdr_simple_ptr(wsi, WSI_TOKEN_PROTOCOL),
+                                                                    NULL, 0)) {
+                       lwsl_warn("User code denied connection\n");
+                       goto bail;
+               }
+
+
+               /*
+                * Perform the handshake according to the protocol version the
+                * client announced
+                */
+
+               switch (wsi->ietf_spec_revision) {
+               case 13:
+                       lwsl_parser("lws_parse calling handshake_04\n");
+                       if (handshake_0405(context, wsi)) {
+                               lwsl_info("hs0405 has failed the connection\n");
+                               goto bail;
+                       }
+                       break;
+
+               default:
+                       lwsl_warn("Unknown client spec version %d\n",
+                                                      wsi->ietf_spec_revision);
+                       goto bail;
+               }
+
+               /* drop the header info */
+
+               if (wsi->u.hdr.ah)
+                       free(wsi->u.hdr.ah);
+
+               wsi->mode = LWS_CONNMODE_WS_SERVING;
+
+               /* union transition */
+               memset(&wsi->u, 0, sizeof(wsi->u));
+
+               /*
+                * create the frame buffer for this connection according to the
+                * size mentioned in the protocol definition.  If 0 there, use
+                * a big default for compatibility
+                */
+
+               n = wsi->protocol->rx_buffer_size;
+               if (!n)
+                       n = LWS_MAX_SOCKET_IO_BUF;
+               n += LWS_SEND_BUFFER_PRE_PADDING + LWS_SEND_BUFFER_POST_PADDING;
+               wsi->u.ws.rx_user_buffer = malloc(n);
+               if (!wsi->u.ws.rx_user_buffer) {
+                       lwsl_err("Out of Mem allocating rx buffer %d\n", n);
+                       goto bail;
+               }
+               lwsl_info("Allocating RX buffer %d\n", n);
+
+               lwsl_parser("accepted v%02d connection\n",
+                                                      wsi->ietf_spec_revision);
+#endif
+               break;
+
+       case WSI_STATE_AWAITING_CLOSE_ACK:
+       case WSI_STATE_ESTABLISHED:
+#ifndef LWS_NO_CLIENT
+               switch (wsi->mode) {
+               case LWS_CONNMODE_WS_CLIENT:
+                       for (n = 0; n < len; n++)
+                               if (libwebsocket_client_rx_sm(
+                                                            wsi, *buf++) < 0) {
+                                       lwsl_info("client rx has bailed\n");
+                                       goto bail;
+                               }
+
+                       return 0;
+               default:
+                       break;
+               }
+#endif
+#ifndef LWS_NO_SERVER
+               /* LWS_CONNMODE_WS_SERVING */
+
+               if (libwebsocket_interpret_incoming_packet(wsi, buf, len) < 0) {
+                       lwsl_info("interpret_incoming_packet has bailed\n");
+                       goto bail;
+               }
+#endif
+               break;
+       default:
+               lwsl_err("libwebsocket_read: Unhandled state\n");
+               break;
+       }
+
+       return 0;
+
+bail:
+       lwsl_info("closing connection at libwebsocket_read bail:\n");
+
+       libwebsocket_close_and_free_session(context, wsi,
+                                                    LWS_CLOSE_STATUS_NOSTATUS);
+
+       return -1;
+}
diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
new file mode 100644 (file)
index 0000000..b31b436
--- /dev/null
@@ -0,0 +1,2334 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "private-libwebsockets.h"
+
+#ifdef WIN32
+#include <tchar.h>
+#include <io.h>
+#include <mstcpip.h>
+#else
+#ifdef LWS_BUILTIN_GETIFADDRS
+#include <getifaddrs.h>
+#else
+#include <ifaddrs.h>
+#endif
+#include <syslog.h>
+#include <sys/un.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif  /* HAVE_SYSTEMD_DAEMON */
+
+#ifdef LWS_OPENSSL_SUPPORT
+int openssl_websocket_private_data_index;
+#endif
+
+#ifdef __MINGW32__
+#include "../win32port/win32helpers/websock-w32.c"
+#else
+#ifdef __MINGW64__
+#include "../win32port/win32helpers/websock-w32.c"
+#endif
+#endif
+
+#ifndef LWS_BUILD_HASH
+#define LWS_BUILD_HASH "unknown-build-hash"
+#endif
+
+static int log_level = LLL_ERR | LLL_WARN | LLL_NOTICE;
+static void lwsl_emit_stderr(int level, const char *line);
+static void (*lwsl_emit)(int level, const char *line) = lwsl_emit_stderr;
+
+static const char *library_version = LWS_LIBRARY_VERSION " " LWS_BUILD_HASH;
+
+static const char * const log_level_names[] = {
+       "ERR",
+       "WARN",
+       "NOTICE",
+       "INFO",
+       "DEBUG",
+       "PARSER",
+       "HEADER",
+       "EXTENSION",
+       "CLIENT",
+       "LATENCY",
+};
+
+#ifndef LWS_NO_CLIENT
+       extern int lws_client_socket_service(
+               struct libwebsocket_context *context,
+               struct libwebsocket *wsi, struct pollfd *pollfd);
+#endif
+#ifndef LWS_NO_SERVER
+       extern int lws_server_socket_service(
+               struct libwebsocket_context *context,
+               struct libwebsocket *wsi, struct pollfd *pollfd);
+#endif
+
+/**
+ * lws_get_library_version: get version and git hash library built from
+ *
+ *     returns a const char * to a string like "1.1 178d78c"
+ *     representing the library version followed by the git head hash it
+ *     was built from
+ */
+
+const char *
+lws_get_library_version(void)
+{
+       return library_version;
+}
+
+int
+insert_wsi_socket_into_fds(struct libwebsocket_context *context,
+                                                      struct libwebsocket *wsi)
+{
+       if (context->fds_count >= context->max_fds) {
+               lwsl_err("Too many fds (%d)\n", context->max_fds);
+               return 1;
+       }
+
+       if (wsi->sock > context->max_fds) {
+               lwsl_err("Socket fd %d is too high (%d)\n",
+                                               wsi->sock, context->max_fds);
+               return 1;
+       }
+
+       assert(wsi);
+       assert(wsi->sock);
+
+       lwsl_info("insert_wsi_socket_into_fds: wsi=%p, sock=%d, fds pos=%d\n",
+                                           wsi, wsi->sock, context->fds_count);
+
+       context->lws_lookup[wsi->sock] = wsi;
+       wsi->position_in_fds_table = context->fds_count;
+       context->fds[context->fds_count].fd = wsi->sock;
+       context->fds[context->fds_count].events = POLLIN;
+       context->fds[context->fds_count++].revents = 0;
+
+       /* external POLL support via protocol 0 */
+       context->protocols[0].callback(context, wsi,
+               LWS_CALLBACK_ADD_POLL_FD,
+               wsi->user_space, (void *)(long)wsi->sock, POLLIN);
+
+       return 0;
+}
+
+static int
+remove_wsi_socket_from_fds(struct libwebsocket_context *context,
+                                                     struct libwebsocket *wsi)
+{
+       int m;
+
+       if (!--context->fds_count)
+               goto do_ext;
+
+       if (wsi->sock > context->max_fds) {
+               lwsl_err("Socket fd %d too high (%d)\n",
+                                                  wsi->sock, context->max_fds);
+               return 1;
+       }
+
+       lwsl_info("remove_wsi_socket_from_fds: wsi=%p, sock=%d, fds pos=%d\n",
+                                   wsi, wsi->sock, wsi->position_in_fds_table);
+
+       m = wsi->position_in_fds_table; /* replace the contents for this */
+
+       /* have the last guy take up the vacant slot */
+       context->fds[m] = context->fds[context->fds_count];
+       /*
+        * end guy's fds_lookup entry remains unchanged
+        * (still same fd pointing to same wsi)
+        */
+       /* end guy's "position in fds table" changed */
+       context->lws_lookup[context->fds[context->fds_count].fd]->
+                                               position_in_fds_table = m;
+       /* deletion guy's lws_lookup entry needs nuking */
+       context->lws_lookup[wsi->sock] = NULL;
+       /* removed wsi has no position any more */
+       wsi->position_in_fds_table = -1;
+
+do_ext:
+       /* remove also from external POLL support via protocol 0 */
+       if (wsi->sock)
+               context->protocols[0].callback(context, wsi,
+                   LWS_CALLBACK_DEL_POLL_FD, wsi->user_space,
+                                                   (void *)(long)wsi->sock, 0);
+
+       return 0;
+}
+
+
+void
+libwebsocket_close_and_free_session(struct libwebsocket_context *context,
+                        struct libwebsocket *wsi, enum lws_close_status reason)
+{
+       int n;
+       int old_state;
+       unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 2 +
+                                                 LWS_SEND_BUFFER_POST_PADDING];
+#ifndef LWS_NO_EXTENSIONS
+       int ret;
+       int m;
+       struct lws_tokens eff_buf;
+       struct libwebsocket_extension *ext;
+#endif
+
+       if (!wsi)
+               return;
+
+       old_state = wsi->state;
+
+       if (old_state == WSI_STATE_DEAD_SOCKET)
+               return;
+
+       /* we tried the polite way... */
+       if (old_state == WSI_STATE_AWAITING_CLOSE_ACK)
+               goto just_kill_connection;
+
+       wsi->u.ws.close_reason = reason;
+
+       if (wsi->mode == LWS_CONNMODE_HTTP_SERVING && wsi->u.http.fd) {
+               close(wsi->u.http.fd);
+               wsi->u.http.fd = 0;
+       }
+
+#ifndef LWS_NO_EXTENSIONS
+       /*
+        * are his extensions okay with him closing?  Eg he might be a mux
+        * parent and just his ch1 aspect is closing?
+        */
+
+       for (n = 0; n < wsi->count_active_extensions; n++) {
+               if (!wsi->active_extensions[n]->callback)
+                       continue;
+
+               m = wsi->active_extensions[n]->callback(context,
+                       wsi->active_extensions[n], wsi,
+                       LWS_EXT_CALLBACK_CHECK_OK_TO_REALLY_CLOSE,
+                                      wsi->active_extensions_user[n], NULL, 0);
+
+               /*
+                * if somebody vetoed actually closing him at this time....
+                * up to the extension to track the attempted close, let's
+                * just bail
+                */
+
+               if (m) {
+                       lwsl_ext("extension vetoed close\n");
+                       return;
+               }
+       }
+
+       /*
+        * flush any tx pending from extensions, since we may send close packet
+        * if there are problems with send, just nuke the connection
+        */
+
+       ret = 1;
+       while (ret == 1) {
+
+               /* default to nobody has more to spill */
+
+               ret = 0;
+               eff_buf.token = NULL;
+               eff_buf.token_len = 0;
+
+               /* show every extension the new incoming data */
+
+               for (n = 0; n < wsi->count_active_extensions; n++) {
+                       m = wsi->active_extensions[n]->callback(
+                                       wsi->protocol->owning_server,
+                                       wsi->active_extensions[n], wsi,
+                                       LWS_EXT_CALLBACK_FLUSH_PENDING_TX,
+                                  wsi->active_extensions_user[n], &eff_buf, 0);
+                       if (m < 0) {
+                               lwsl_ext("Extension reports fatal error\n");
+                               goto just_kill_connection;
+                       }
+                       if (m)
+                               /*
+                                * at least one extension told us he has more
+                                * to spill, so we will go around again after
+                                */
+                               ret = 1;
+               }
+
+               /* assuming they left us something to send, send it */
+
+               if (eff_buf.token_len)
+                       if (lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
+                                     eff_buf.token_len) != eff_buf.token_len) {
+                               lwsl_debug("close: ext spill failed\n");
+                               goto just_kill_connection;
+                       }
+       }
+#endif
+
+       /*
+        * signal we are closing, libsocket_write will
+        * add any necessary version-specific stuff.  If the write fails,
+        * no worries we are closing anyway.  If we didn't initiate this
+        * close, then our state has been changed to
+        * WSI_STATE_RETURNED_CLOSE_ALREADY and we will skip this.
+        *
+        * Likewise if it's a second call to close this connection after we
+        * sent the close indication to the peer already, we are in state
+        * WSI_STATE_AWAITING_CLOSE_ACK and will skip doing this a second time.
+        */
+
+       if (old_state == WSI_STATE_ESTABLISHED &&
+                                         reason != LWS_CLOSE_STATUS_NOSTATUS) {
+
+               lwsl_debug("sending close indication...\n");
+
+               /* make valgrind happy */
+               memset(buf, 0, sizeof(buf));
+               n = libwebsocket_write(wsi,
+                               &buf[LWS_SEND_BUFFER_PRE_PADDING + 2],
+                                                           0, LWS_WRITE_CLOSE);
+               if (n >= 0) {
+                       /*
+                        * we have sent a nice protocol level indication we
+                        * now wish to close, we should not send anything more
+                        */
+
+                       wsi->state = WSI_STATE_AWAITING_CLOSE_ACK;
+
+                       /*
+                        * ...and we should wait for a reply for a bit
+                        * out of politeness
+                        */
+
+                       libwebsocket_set_timeout(wsi,
+                                                 PENDING_TIMEOUT_CLOSE_ACK, 1);
+
+                       lwsl_debug("sent close indication, awaiting ack\n");
+
+                       return;
+               }
+
+               lwsl_info("close: sending close packet failed, hanging up\n");
+
+               /* else, the send failed and we should just hang up */
+       }
+
+just_kill_connection:
+
+       lwsl_debug("close: just_kill_connection\n");
+
+       /*
+        * we won't be servicing or receiving anything further from this guy
+        * delete socket from the internal poll list if still present
+        */
+
+       remove_wsi_socket_from_fds(context, wsi);
+
+       wsi->state = WSI_STATE_DEAD_SOCKET;
+
+       if ((old_state == WSI_STATE_ESTABLISHED ||
+            wsi->mode == LWS_CONNMODE_WS_SERVING ||
+            wsi->mode == LWS_CONNMODE_WS_CLIENT)) {
+
+               if (wsi->u.ws.rx_user_buffer) {
+                       free(wsi->u.ws.rx_user_buffer);
+                       wsi->u.ws.rx_user_buffer = NULL;
+               }
+               if (wsi->u.ws.rxflow_buffer) {
+                       free(wsi->u.ws.rxflow_buffer);
+                       wsi->u.ws.rxflow_buffer = NULL;
+               }
+       }
+
+       /* tell the user it's all over for this guy */
+
+       if (wsi->protocol && wsi->protocol->callback &&
+                       ((old_state == WSI_STATE_ESTABLISHED) ||
+                        (old_state == WSI_STATE_RETURNED_CLOSE_ALREADY) ||
+                        (old_state == WSI_STATE_AWAITING_CLOSE_ACK))) {
+               lwsl_debug("calling back CLOSED\n");
+               wsi->protocol->callback(context, wsi, LWS_CALLBACK_CLOSED,
+                                                     wsi->user_space, NULL, 0);
+       } else
+               lwsl_debug("not calling back closed\n");
+
+#ifndef LWS_NO_EXTENSIONS
+       /* deallocate any active extension contexts */
+
+       for (n = 0; n < wsi->count_active_extensions; n++) {
+               if (!wsi->active_extensions[n]->callback)
+                       continue;
+
+               wsi->active_extensions[n]->callback(context,
+                       wsi->active_extensions[n], wsi,
+                               LWS_EXT_CALLBACK_DESTROY,
+                                      wsi->active_extensions_user[n], NULL, 0);
+
+               free(wsi->active_extensions_user[n]);
+       }
+
+       /*
+        * inform all extensions in case they tracked this guy out of band
+        * even though not active on him specifically
+        */
+
+       ext = context->extensions;
+       while (ext && ext->callback) {
+               ext->callback(context, ext, wsi,
+                               LWS_EXT_CALLBACK_DESTROY_ANY_WSI_CLOSING,
+                                      NULL, NULL, 0);
+               ext++;
+       }
+#endif
+
+/*     lwsl_info("closing fd=%d\n", wsi->sock); */
+
+#ifdef LWS_OPENSSL_SUPPORT
+       if (wsi->ssl) {
+               n = SSL_get_fd(wsi->ssl);
+               SSL_shutdown(wsi->ssl);
+               compatible_close(n);
+               SSL_free(wsi->ssl);
+       } else {
+#endif
+               if (wsi->sock) {
+                       n = shutdown(wsi->sock, SHUT_RDWR);
+                       if (n)
+                               lwsl_debug("closing: shutdown returned %d\n",
+                                                                       errno);
+
+                       n = compatible_close(wsi->sock);
+                       if (n)
+                               lwsl_debug("closing: close returned %d\n",
+                                                                       errno);
+               }
+#ifdef LWS_OPENSSL_SUPPORT
+       }
+#endif
+       if (wsi->protocol && wsi->protocol->per_session_data_size &&
+                                       wsi->user_space) /* user code may own */
+               free(wsi->user_space);
+
+       free(wsi);
+}
+
+/**
+ * libwebsockets_get_peer_addresses() - Get client address information
+ * @context:   Libwebsockets context
+ * @wsi:       Local struct libwebsocket associated with
+ * @fd:                Connection socket descriptor
+ * @name:      Buffer to take client address name
+ * @name_len:  Length of client address name buffer
+ * @rip:       Buffer to take client address IP qotted quad
+ * @rip_len:   Length of client address IP buffer
+ *
+ *     This function fills in @name and @rip with the name and IP of
+ *     the client connected with socket descriptor @fd.  Names may be
+ *     truncated if there is not enough room.  If either cannot be
+ *     determined, they will be returned as valid zero-length strings.
+ */
+
+void
+libwebsockets_get_peer_addresses(struct libwebsocket_context *context,
+       struct libwebsocket *wsi, int fd, char *name, int name_len,
+                                       char *rip, int rip_len)
+{
+       unsigned int len;
+       struct sockaddr_in sin;
+       struct hostent *host;
+       struct hostent *host1;
+       char ip[128];
+       unsigned char *p;
+       int n;
+       int ret = -1;
+#ifdef AF_LOCAL
+       struct sockaddr_un *un;
+#endif
+
+       rip[0] = '\0';
+       name[0] = '\0';
+
+       lws_latency_pre(context, wsi);
+
+       len = sizeof(sin);
+       if (getpeername(fd, (struct sockaddr *) &sin, &len) < 0) {
+               perror("getpeername");
+               goto bail;
+       }
+
+       host = gethostbyaddr((char *) &sin.sin_addr, sizeof(sin.sin_addr),
+                                                                      AF_INET);
+       if (host == NULL) {
+               perror("gethostbyaddr");
+               goto bail;
+       }
+
+       strncpy(name, host->h_name, name_len);
+       name[name_len - 1] = '\0';
+
+       host1 = gethostbyname(host->h_name);
+       if (host1 == NULL)
+               goto bail;
+       p = (unsigned char *)host1;
+       n = 0;
+       while (p != NULL) {
+               p = (unsigned char *)host1->h_addr_list[n++];
+               if (p == NULL)
+                       continue;
+               if ((host1->h_addrtype != AF_INET)
+#ifdef AF_LOCAL
+                       && (host1->h_addrtype != AF_LOCAL)
+#endif
+                       )
+                       continue;
+
+               if (host1->h_addrtype == AF_INET)
+                       sprintf(ip, "%u.%u.%u.%u", p[0], p[1], p[2], p[3]);
+#ifdef AF_LOCAL
+               else {
+                       un = (struct sockaddr_un *)p;
+                       strncpy(ip, un->sun_path, sizeof(ip) - 1);
+                       ip[sizeof(ip) - 1] = '\0';
+               }
+#endif
+               p = NULL;
+               strncpy(rip, ip, rip_len);
+               rip[rip_len - 1] = '\0';
+       }
+
+       ret = 0;
+bail:
+       lws_latency(context, wsi, "libwebsockets_get_peer_addresses", ret, 1);
+}
+
+int libwebsockets_get_random(struct libwebsocket_context *context,
+                                                            void *buf, int len)
+{
+       int n;
+       char *p = (char *)buf;
+
+#ifdef WIN32
+       for (n = 0; n < len; n++)
+               p[n] = (unsigned char)rand();
+#else
+       n = read(context->fd_random, p, len);
+#endif
+
+       return n;
+}
+
+int lws_set_socket_options(struct libwebsocket_context *context, int fd)
+{
+       int optval = 1;
+       socklen_t optlen = sizeof(optval);
+#ifdef WIN32
+       unsigned long optl = 0;
+#endif
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+       struct protoent *tcp_proto;
+#endif
+
+       if (context->ka_time) {
+               /* enable keepalive on this socket */
+               optval = 1;
+               if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE,
+                                            (const void *)&optval, optlen) < 0)
+                       return 1;
+
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+
+               /*
+                * didn't find a way to set these per-socket, need to
+                * tune kernel systemwide values
+                */
+#elif WIN32
+               {
+                       DWORD dwBytesRet;
+                       struct tcp_keepalive alive;
+                       alive.onoff = TRUE;
+                       alive.keepalivetime = context->ka_time;
+                       alive.keepaliveinterval = context->ka_interval;
+
+                       if (WSAIoctl(fd, SIO_KEEPALIVE_VALS, &alive, sizeof(alive), 
+                                                                       NULL, 0, &dwBytesRet, NULL, NULL))
+                               return 1;
+               }
+#else
+               /* set the keepalive conditions we want on it too */
+               optval = context->ka_time;
+               if (setsockopt(fd, IPPROTO_IP, TCP_KEEPIDLE,
+                                            (const void *)&optval, optlen) < 0)
+                       return 1;
+
+               optval = context->ka_interval;
+               if (setsockopt(fd, IPPROTO_IP, TCP_KEEPINTVL,
+                                            (const void *)&optval, optlen) < 0)
+                       return 1;
+
+               optval = context->ka_probes;
+               if (setsockopt(fd, IPPROTO_IP, TCP_KEEPCNT,
+                                            (const void *)&optval, optlen) < 0)
+                       return 1;
+#endif
+       }
+
+       /* Disable Nagle */
+       optval = 1;
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+       setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&optval, optlen);
+#else
+       tcp_proto = getprotobyname("TCP");
+       setsockopt(fd, tcp_proto->p_proto, TCP_NODELAY, &optval, optlen);
+#endif
+
+       /* We are nonblocking... */
+#ifdef WIN32
+       ioctlsocket(fd, FIONBIO, &optl);
+#else
+       fcntl(fd, F_SETFL, O_NONBLOCK);
+#endif
+
+       return 0;
+}
+
+int lws_send_pipe_choked(struct libwebsocket *wsi)
+{
+       struct pollfd fds;
+
+       fds.fd = wsi->sock;
+       fds.events = POLLOUT;
+       fds.revents = 0;
+
+       if (poll(&fds, 1, 0) != 1)
+               return 1;
+
+       if ((fds.revents & POLLOUT) == 0)
+               return 1;
+
+       /* okay to send another packet without blocking */
+
+       return 0;
+}
+
+int
+lws_handle_POLLOUT_event(struct libwebsocket_context *context,
+                               struct libwebsocket *wsi, struct pollfd *pollfd)
+{
+       int n;
+
+#ifndef LWS_NO_EXTENSIONS
+       struct lws_tokens eff_buf;
+       int ret;
+       int m;
+       int handled = 0;
+
+       for (n = 0; n < wsi->count_active_extensions; n++) {
+               if (!wsi->active_extensions[n]->callback)
+                       continue;
+
+               m = wsi->active_extensions[n]->callback(context,
+                       wsi->active_extensions[n], wsi,
+                       LWS_EXT_CALLBACK_IS_WRITEABLE,
+                                      wsi->active_extensions_user[n], NULL, 0);
+               if (m > handled)
+                       handled = m;
+       }
+
+       if (handled == 1)
+               goto notify_action;
+
+       if (!wsi->extension_data_pending || handled == 2)
+               goto user_service;
+
+       /*
+        * check in on the active extensions, see if they
+        * had pending stuff to spill... they need to get the
+        * first look-in otherwise sequence will be disordered
+        *
+        * NULL, zero-length eff_buf means just spill pending
+        */
+
+       ret = 1;
+       while (ret == 1) {
+
+               /* default to nobody has more to spill */
+
+               ret = 0;
+               eff_buf.token = NULL;
+               eff_buf.token_len = 0;
+
+               /* give every extension a chance to spill */
+
+               for (n = 0; n < wsi->count_active_extensions; n++) {
+                       m = wsi->active_extensions[n]->callback(
+                               wsi->protocol->owning_server,
+                               wsi->active_extensions[n], wsi,
+                                       LWS_EXT_CALLBACK_PACKET_TX_PRESEND,
+                                  wsi->active_extensions_user[n], &eff_buf, 0);
+                       if (m < 0) {
+                               lwsl_err("ext reports fatal error\n");
+                               return -1;
+                       }
+                       if (m)
+                               /*
+                                * at least one extension told us he has more
+                                * to spill, so we will go around again after
+                                */
+                               ret = 1;
+               }
+
+               /* assuming they gave us something to send, send it */
+
+               if (eff_buf.token_len) {
+                       n = lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
+                                                            eff_buf.token_len);
+                       if (n < 0)
+                               return -1;
+                       /*
+                        * Keep amount spilled small to minimize chance of this
+                        */
+                       if (n != eff_buf.token_len) {
+                               lwsl_err("Unable to spill ext %d vs %s\n",
+                                                         eff_buf.token_len, n);
+                               return -1;
+                       }
+               } else
+                       continue;
+
+               /* no extension has more to spill */
+
+               if (!ret)
+                       continue;
+
+               /*
+                * There's more to spill from an extension, but we just sent
+                * something... did that leave the pipe choked?
+                */
+
+               if (!lws_send_pipe_choked(wsi))
+                       /* no we could add more */
+                       continue;
+
+               lwsl_info("choked in POLLOUT service\n");
+
+               /*
+                * Yes, he's choked.  Leave the POLLOUT masked on so we will
+                * come back here when he is unchoked.  Don't call the user
+                * callback to enforce ordering of spilling, he'll get called
+                * when we come back here and there's nothing more to spill.
+                */
+
+               return 0;
+       }
+
+       wsi->extension_data_pending = 0;
+
+user_service:
+#endif
+       /* one shot */
+
+       if (pollfd) {
+               pollfd->events &= ~POLLOUT;
+
+               /* external POLL support via protocol 0 */
+               context->protocols[0].callback(context, wsi,
+                       LWS_CALLBACK_CLEAR_MODE_POLL_FD,
+                       wsi->user_space, (void *)(long)wsi->sock, POLLOUT);
+       }
+#ifndef LWS_NO_EXTENSIONS
+notify_action:
+#endif
+
+       if (wsi->mode == LWS_CONNMODE_WS_CLIENT)
+               n = LWS_CALLBACK_CLIENT_WRITEABLE;
+       else
+               n = LWS_CALLBACK_SERVER_WRITEABLE;
+
+       return user_callback_handle_rxflow(wsi->protocol->callback, context,
+                       wsi, (enum libwebsocket_callback_reasons) n,
+                                                     wsi->user_space, NULL, 0);
+}
+
+
+
+int
+libwebsocket_service_timeout_check(struct libwebsocket_context *context,
+                                    struct libwebsocket *wsi, unsigned int sec)
+{
+#ifndef LWS_NO_EXTENSIONS
+       int n;
+
+       /*
+        * if extensions want in on it (eg, we are a mux parent)
+        * give them a chance to service child timeouts
+        */
+
+       for (n = 0; n < wsi->count_active_extensions; n++)
+               wsi->active_extensions[n]->callback(
+                                   context, wsi->active_extensions[n],
+                                   wsi, LWS_EXT_CALLBACK_1HZ,
+                                   wsi->active_extensions_user[n], NULL, sec);
+
+#endif
+       if (!wsi->pending_timeout)
+               return 0;
+
+       /*
+        * if we went beyond the allowed time, kill the
+        * connection
+        */
+
+       if (sec > wsi->pending_timeout_limit) {
+               lwsl_info("TIMEDOUT WAITING\n");
+               libwebsocket_close_and_free_session(context,
+                               wsi, LWS_CLOSE_STATUS_NOSTATUS);
+               return 1;
+       }
+
+       return 0;
+}
+
+/**
+ * libwebsocket_service_fd() - Service polled socket with something waiting
+ * @context:   Websocket context
+ * @pollfd:    The pollfd entry describing the socket fd and which events
+ *             happened.
+ *
+ *     This function takes a pollfd that has POLLIN or POLLOUT activity and
+ *     services it according to the state of the associated
+ *     struct libwebsocket.
+ *
+ *     The one call deals with all "service" that might happen on a socket
+ *     including listen accepts, http files as well as websocket protocol.
+ */
+
+int
+libwebsocket_service_fd(struct libwebsocket_context *context,
+                                                         struct pollfd *pollfd)
+{
+       struct libwebsocket *wsi;
+       int n;
+       int m;
+       int listen_socket_fds_index = 0;
+       struct timeval tv;
+       int timed_out = 0;
+       int our_fd = 0;
+
+#ifndef LWS_NO_EXTENSIONS
+       int more = 1;
+#endif
+       struct lws_tokens eff_buf;
+
+       if (context->listen_service_fd)
+               listen_socket_fds_index = context->lws_lookup[
+                            context->listen_service_fd]->position_in_fds_table;
+
+       /*
+        * you can call us with pollfd = NULL to just allow the once-per-second
+        * global timeout checks; if less than a second since the last check
+        * it returns immediately then.
+        */
+
+       gettimeofday(&tv, NULL);
+
+       if (context->last_timeout_check_s != tv.tv_sec) {
+               context->last_timeout_check_s = tv.tv_sec;
+
+               #ifndef WIN32
+               /* if our parent went down, don't linger around */
+               if (context->started_with_parent &&
+                                     kill(context->started_with_parent, 0) < 0)
+                       kill(getpid(), SIGTERM);
+               #endif
+
+               /* global timeout check once per second */
+
+               if (pollfd)
+                       our_fd = pollfd->fd;
+
+               for (n = 0; n < context->fds_count; n++) {
+                       m = context->fds[n].fd;
+                       wsi = context->lws_lookup[m];
+                       if (!wsi)
+                               continue;
+
+                       if (libwebsocket_service_timeout_check(context, wsi,
+                                                                    tv.tv_sec))
+                               /* he did time out... */
+                               if (m == our_fd)
+                                       /* it was the guy we came to service! */
+                                       timed_out = 1;
+               }
+       }
+
+       /* the socket we came to service timed out, nothing to do */
+       if (timed_out)
+               return 0;
+
+       /* just here for timeout management? */
+
+       if (pollfd == NULL)
+               return 0;
+
+       /* no, here to service a socket descriptor */
+
+       /*
+        * deal with listen service piggybacking
+        * every listen_service_modulo services of other fds, we
+        * sneak one in to service the listen socket if there's anything waiting
+        *
+        * To handle connection storms, as found in ab, if we previously saw a
+        * pending connection here, it causes us to check again next time.
+        */
+
+       if (context->listen_service_fd && pollfd !=
+                                      &context->fds[listen_socket_fds_index]) {
+               context->listen_service_count++;
+               if (context->listen_service_extraseen ||
+                               context->listen_service_count ==
+                                              context->listen_service_modulo) {
+                       context->listen_service_count = 0;
+                       m = 1;
+                       if (context->listen_service_extraseen > 5)
+                               m = 2;
+                       while (m--) {
+                               /*
+                                * even with extpoll, we prepared this
+                                * internal fds for listen
+                                */
+                               n = poll(&context->fds[listen_socket_fds_index],
+                                                                         1, 0);
+                               if (n > 0) { /* there's a conn waiting for us */
+                                       libwebsocket_service_fd(context,
+                                               &context->
+                                                 fds[listen_socket_fds_index]);
+                                       context->listen_service_extraseen++;
+                               } else {
+                                       if (context->listen_service_extraseen)
+                                               context->
+                                                    listen_service_extraseen--;
+                                       break;
+                               }
+                       }
+               }
+
+       }
+
+       /* okay, what we came here to do... */
+
+       wsi = context->lws_lookup[pollfd->fd];
+       if (wsi == NULL) {
+               if (pollfd->fd > 11)
+                       lwsl_err("unexpected NULL wsi fd=%d fds_count=%d\n",
+                                               pollfd->fd, context->fds_count);
+               return 0;
+       }
+
+       switch (wsi->mode) {
+
+#ifndef LWS_NO_SERVER
+       case LWS_CONNMODE_HTTP_SERVING:
+       case LWS_CONNMODE_SERVER_LISTENER:
+       case LWS_CONNMODE_SSL_ACK_PENDING:
+               return lws_server_socket_service(context, wsi, pollfd);
+#endif
+
+       case LWS_CONNMODE_WS_SERVING:
+       case LWS_CONNMODE_WS_CLIENT:
+
+               /* handle session socket closed */
+
+               if ((!pollfd->revents & POLLIN) &&
+                               (pollfd->revents & (POLLERR | POLLHUP))) {
+
+                       lwsl_debug("Session Socket %p (fd=%d) dead\n",
+                               (void *)wsi, pollfd->fd);
+
+                       libwebsocket_close_and_free_session(context, wsi,
+                                                    LWS_CLOSE_STATUS_NOSTATUS);
+                       return 0;
+               }
+
+               /* the guy requested a callback when it was OK to write */
+
+               if ((pollfd->revents & POLLOUT) &&
+                                           wsi->state == WSI_STATE_ESTABLISHED)
+                       if (lws_handle_POLLOUT_event(context, wsi,
+                                                                 pollfd) < 0) {
+                               lwsl_info("libwebsocket_service_fd: closing\n");
+                               libwebsocket_close_and_free_session(
+                                      context, wsi, LWS_CLOSE_STATUS_NOSTATUS);
+                               return 0;
+                       }
+
+
+               /* any incoming data ready? */
+
+               if (!(pollfd->revents & POLLIN))
+                       break;
+
+#ifdef LWS_OPENSSL_SUPPORT
+read_pending:
+               if (wsi->ssl) {
+                       eff_buf.token_len = SSL_read(wsi->ssl,
+                                       context->service_buffer,
+                                              sizeof(context->service_buffer));
+                       if (!eff_buf.token_len) {
+                               n = SSL_get_error(wsi->ssl, eff_buf.token_len);
+                               lwsl_err("SSL_read returned 0 with reason %s\n",
+                                 ERR_error_string(n,
+                                             (char *)context->service_buffer));
+                       }
+               } else
+#endif
+                       eff_buf.token_len = recv(pollfd->fd,
+                               context->service_buffer,
+                                           sizeof(context->service_buffer), 0);
+
+               if (eff_buf.token_len < 0) {
+                       lwsl_debug("Socket read returned %d\n",
+                                                           eff_buf.token_len);
+                       if (errno != EINTR && errno != EAGAIN)
+                               libwebsocket_close_and_free_session(context,
+                                              wsi, LWS_CLOSE_STATUS_NOSTATUS);
+                       return 0;
+               }
+               if (!eff_buf.token_len) {
+                       lwsl_info("closing connection due to 0 length read\n");
+                       libwebsocket_close_and_free_session(context, wsi,
+                                                   LWS_CLOSE_STATUS_NOSTATUS);
+                       return 0;
+               }
+
+               /*
+                * give any active extensions a chance to munge the buffer
+                * before parse.  We pass in a pointer to an lws_tokens struct
+                * prepared with the default buffer and content length that's in
+                * there.  Rather than rewrite the default buffer, extensions
+                * that expect to grow the buffer can adapt .token to
+                * point to their own per-connection buffer in the extension
+                * user allocation.  By default with no extensions or no
+                * extension callback handling, just the normal input buffer is
+                * used then so it is efficient.
+                */
+
+               eff_buf.token = (char *)context->service_buffer;
+#ifndef LWS_NO_EXTENSIONS
+               more = 1;
+               while (more) {
+
+                       more = 0;
+
+                       for (n = 0; n < wsi->count_active_extensions; n++) {
+                               m = wsi->active_extensions[n]->callback(context,
+                                       wsi->active_extensions[n], wsi,
+                                       LWS_EXT_CALLBACK_PACKET_RX_PREPARSE,
+                                       wsi->active_extensions_user[n],
+                                                                  &eff_buf, 0);
+                               if (m < 0) {
+                                       lwsl_ext(
+                                           "Extension reports fatal error\n");
+                                       libwebsocket_close_and_free_session(
+                                               context, wsi,
+                                                   LWS_CLOSE_STATUS_NOSTATUS);
+                                       return 0;
+                               }
+                               if (m)
+                                       more = 1;
+                       }
+#endif
+                       /* service incoming data */
+
+                       if (eff_buf.token_len) {
+                               n = libwebsocket_read(context, wsi,
+                                       (unsigned char *)eff_buf.token,
+                                                           eff_buf.token_len);
+                               if (n < 0)
+                                       /* we closed wsi */
+                                       return 0;
+                       }
+#ifndef LWS_NO_EXTENSIONS
+                       eff_buf.token = NULL;
+                       eff_buf.token_len = 0;
+               }
+#endif
+
+#ifdef LWS_OPENSSL_SUPPORT
+               if (wsi->ssl && SSL_pending(wsi->ssl))
+                       goto read_pending;
+#endif
+               break;
+
+       default:
+#ifdef LWS_NO_CLIENT
+               break;
+#else
+               return  lws_client_socket_service(context, wsi, pollfd);
+#endif
+       }
+
+       return 0;
+}
+
+
+/**
+ * libwebsocket_context_destroy() - Destroy the websocket context
+ * @context:   Websocket context
+ *
+ *     This function closes any active connections and then frees the
+ *     context.  After calling this, any further use of the context is
+ *     undefined.
+ */
+void
+libwebsocket_context_destroy(struct libwebsocket_context *context)
+{
+#ifndef LWS_NO_EXTENSIONS
+       int n;
+       int m;
+       struct libwebsocket_extension *ext;
+       struct libwebsocket_protocols *protocol = context->protocols;
+
+#ifdef LWS_LATENCY
+       if (context->worst_latency_info[0])
+               lwsl_notice("Worst latency: %s\n", context->worst_latency_info);
+#endif
+
+       for (n = 0; n < context->fds_count; n++) {
+               struct libwebsocket *wsi =
+                                       context->lws_lookup[context->fds[n].fd];
+               libwebsocket_close_and_free_session(context,
+                       wsi, LWS_CLOSE_STATUS_NOSTATUS /* no protocol close */);
+               n--;
+       }
+
+       /*
+        * give all extensions a chance to clean up any per-context
+        * allocations they might have made
+        */
+
+       ext = context->extensions;
+       m = LWS_EXT_CALLBACK_CLIENT_CONTEXT_DESTRUCT;
+       if (context->listen_port)
+               m = LWS_EXT_CALLBACK_SERVER_CONTEXT_DESTRUCT;
+       while (ext && ext->callback) {
+               ext->callback(context, ext, NULL,
+                       (enum libwebsocket_extension_callback_reasons)m,
+                                                                NULL, NULL, 0);
+               ext++;
+       }
+
+       /*
+        * inform all the protocols that they are done and will have no more
+        * callbacks
+        */
+
+       while (protocol->callback) {
+               protocol->callback(context, NULL, LWS_CALLBACK_PROTOCOL_DESTROY,
+                               NULL, NULL, 0);
+               protocol++;
+       }
+
+#endif
+
+#ifdef WIN32
+#else
+       close(context->fd_random);
+#endif
+
+#ifdef LWS_OPENSSL_SUPPORT
+       if (context->ssl_ctx)
+               SSL_CTX_free(context->ssl_ctx);
+       if (context->ssl_client_ctx)
+               SSL_CTX_free(context->ssl_client_ctx);
+
+       ERR_remove_state(0);
+       ERR_free_strings();
+       EVP_cleanup();
+       CRYPTO_cleanup_all_ex_data();
+#endif
+
+       if (context->fds)
+               free(context->fds);
+       if (context->lws_lookup)
+               free(context->lws_lookup);
+
+       free(context);
+
+#ifdef WIN32
+       WSACleanup();
+#endif
+}
+
+/**
+ * libwebsocket_context_user() - get the user data associated with the context
+ * @context: Websocket context
+ *
+ *     This returns the optional user allocation that can be attached to
+ *     the context the sockets live in at context_create time.  It's a way
+ *     to let all sockets serviced in the same context share data without
+ *     using globals statics in the user code.
+ */
+LWS_EXTERN void *
+libwebsocket_context_user(struct libwebsocket_context *context)
+{
+       return context->user_space;
+}
+
+/**
+ * libwebsocket_service() - Service any pending websocket activity
+ * @context:   Websocket context
+ * @timeout_ms:        Timeout for poll; 0 means return immediately if nothing needed
+ *             service otherwise block and service immediately, returning
+ *             after the timeout if nothing needed service.
+ *
+ *     This function deals with any pending websocket traffic, for three
+ *     kinds of event.  It handles these events on both server and client
+ *     types of connection the same.
+ *
+ *     1) Accept new connections to our context's server
+ *
+ *     2) Call the receive callback for incoming frame data received by
+ *         server or client connections.
+ *
+ *     You need to call this service function periodically to all the above
+ *     functions to happen; if your application is single-threaded you can
+ *     just call it in your main event loop.
+ *
+ *     Alternatively you can fork a new process that asynchronously handles
+ *     calling this service in a loop.  In that case you are happy if this
+ *     call blocks your thread until it needs to take care of something and
+ *     would call it with a large nonzero timeout.  Your loop then takes no
+ *     CPU while there is nothing happening.
+ *
+ *     If you are calling it in a single-threaded app, you don't want it to
+ *     wait around blocking other things in your loop from happening, so you
+ *     would call it with a timeout_ms of 0, so it returns immediately if
+ *     nothing is pending, or as soon as it services whatever was pending.
+ */
+
+int
+libwebsocket_service(struct libwebsocket_context *context, int timeout_ms)
+{
+       int n;
+
+       /* stay dead once we are dead */
+
+       if (context == NULL)
+               return 1;
+
+       /* wait for something to need service */
+
+       n = poll(context->fds, context->fds_count, timeout_ms);
+       if (n == 0) /* poll timeout */
+               return 0;
+
+       if (n < 0)
+               return -1;
+
+       /* any socket with events to service? */
+
+       for (n = 0; n < context->fds_count; n++)
+               if (context->fds[n].revents)
+                       if (libwebsocket_service_fd(context,
+                                                       &context->fds[n]) < 0)
+                               return -1;
+       return 0;
+}
+
+#ifndef LWS_NO_EXTENSIONS
+int
+lws_any_extension_handled(struct libwebsocket_context *context,
+                         struct libwebsocket *wsi,
+                         enum libwebsocket_extension_callback_reasons r,
+                                                      void *v, size_t len)
+{
+       int n;
+       int handled = 0;
+
+       /* maybe an extension will take care of it for us */
+
+       for (n = 0; n < wsi->count_active_extensions && !handled; n++) {
+               if (!wsi->active_extensions[n]->callback)
+                       continue;
+
+               handled |= wsi->active_extensions[n]->callback(context,
+                       wsi->active_extensions[n], wsi,
+                       r, wsi->active_extensions_user[n], v, len);
+       }
+
+       return handled;
+}
+
+
+void *
+lws_get_extension_user_matching_ext(struct libwebsocket *wsi,
+                                          struct libwebsocket_extension *ext)
+{
+       int n = 0;
+
+       if (wsi == NULL)
+               return NULL;
+
+       while (n < wsi->count_active_extensions) {
+               if (wsi->active_extensions[n] != ext) {
+                       n++;
+                       continue;
+               }
+               return wsi->active_extensions_user[n];
+       }
+
+       return NULL;
+}
+#endif
+
+/**
+ * libwebsocket_callback_on_writable() - Request a callback when this socket
+ *                                      becomes able to be written to without
+ *                                      blocking
+ *
+ * @context:   libwebsockets context
+ * @wsi:       Websocket connection instance to get callback for
+ */
+
+int
+libwebsocket_callback_on_writable(struct libwebsocket_context *context,
+                                                     struct libwebsocket *wsi)
+{
+#ifndef LWS_NO_EXTENSIONS
+       int n;
+       int handled = 0;
+
+       /* maybe an extension will take care of it for us */
+
+       for (n = 0; n < wsi->count_active_extensions; n++) {
+               if (!wsi->active_extensions[n]->callback)
+                       continue;
+
+               handled |= wsi->active_extensions[n]->callback(context,
+                       wsi->active_extensions[n], wsi,
+                       LWS_EXT_CALLBACK_REQUEST_ON_WRITEABLE,
+                                      wsi->active_extensions_user[n], NULL, 0);
+       }
+
+       if (handled)
+               return 1;
+#endif
+       if (wsi->position_in_fds_table < 0) {
+               lwsl_err("libwebsocket_callback_on_writable: failed to find socket %d\n",
+                                                                    wsi->sock);
+               return -1;
+       }
+
+       context->fds[wsi->position_in_fds_table].events |= POLLOUT;
+
+       /* external POLL support via protocol 0 */
+       context->protocols[0].callback(context, wsi,
+               LWS_CALLBACK_SET_MODE_POLL_FD,
+               wsi->user_space, (void *)(long)wsi->sock, POLLOUT);
+
+       return 1;
+}
+
+/**
+ * libwebsocket_callback_on_writable_all_protocol() - Request a callback for
+ *                     all connections using the given protocol when it
+ *                     becomes possible to write to each socket without
+ *                     blocking in turn.
+ *
+ * @protocol:  Protocol whose connections will get callbacks
+ */
+
+int
+libwebsocket_callback_on_writable_all_protocol(
+                                 const struct libwebsocket_protocols *protocol)
+{
+       if (protocol) {
+               struct libwebsocket_context *context = protocol->owning_server;
+               int n;
+               struct libwebsocket *wsi;
+
+               if (context) {
+                       for (n = 0; n < context->fds_count; n++) {
+                               wsi = context->lws_lookup[context->fds[n].fd];
+                               if (!wsi)
+                                       continue;
+                               if (wsi->protocol == protocol)
+                                       libwebsocket_callback_on_writable(context, wsi);
+                       }
+               }
+       }
+
+       return 0;
+}
+
+/**
+ * libwebsocket_set_timeout() - marks the wsi as subject to a timeout
+ *
+ * You will not need this unless you are doing something special
+ *
+ * @wsi:       Websocket connection instance
+ * @reason:    timeout reason
+ * @secs:      how many seconds
+ */
+
+void
+libwebsocket_set_timeout(struct libwebsocket *wsi,
+                                         enum pending_timeout reason, int secs)
+{
+       struct timeval tv;
+
+       gettimeofday(&tv, NULL);
+
+       wsi->pending_timeout_limit = tv.tv_sec + secs;
+       wsi->pending_timeout = reason;
+}
+
+
+/**
+ * libwebsocket_get_socket_fd() - returns the socket file descriptor
+ *
+ * You will not need this unless you are doing something special
+ *
+ * @wsi:       Websocket connection instance
+ */
+
+int
+libwebsocket_get_socket_fd(struct libwebsocket *wsi)
+{
+       return wsi->sock;
+}
+
+#ifdef LWS_LATENCY
+void
+lws_latency(struct libwebsocket_context *context, struct libwebsocket *wsi,
+                                    const char *action, int ret, int completed)
+{
+       struct timeval tv;
+       unsigned long u;
+       char buf[256];
+
+       gettimeofday(&tv, NULL);
+
+       u = (tv.tv_sec * 1000000) + tv.tv_usec;
+
+       if (action) {
+               if (completed) {
+                       if (wsi->action_start == wsi->latency_start)
+                               sprintf(buf,
+                       "Completion first try lat %luus: %p: ret %d: %s\n",
+                                       u - wsi->latency_start,
+                                       (void *)wsi, ret, action);
+                       else
+                               sprintf(buf,
+                       "Completion %luus: lat %luus: %p: ret %d: %s\n",
+                                       u - wsi->action_start,
+                                       u - wsi->latency_start,
+                                       (void *)wsi, ret, action);
+                       wsi->action_start = 0;
+               } else
+                       sprintf(buf, "lat %luus: %p: ret %d: %s\n",
+                                       u - wsi->latency_start,
+                                                     (void *)wsi, ret, action);
+               if (u - wsi->latency_start > context->worst_latency) {
+                       context->worst_latency = u - wsi->latency_start;
+                       strcpy(context->worst_latency_info, buf);
+               }
+               lwsl_latency("%s", buf);
+       } else {
+               wsi->latency_start = u;
+               if (!wsi->action_start)
+                       wsi->action_start = u;
+       }
+}
+#endif
+
+#ifdef LWS_NO_SERVER
+int
+_libwebsocket_rx_flow_control(struct libwebsocket *wsi)
+{
+       return 0;
+}
+#else
+int
+_libwebsocket_rx_flow_control(struct libwebsocket *wsi)
+{
+       struct libwebsocket_context *context = wsi->protocol->owning_server;
+       int n;
+
+       if (!(wsi->u.ws.rxflow_change_to & 2))
+               return 0;
+
+       wsi->u.ws.rxflow_change_to &= ~2;
+
+       lwsl_info("rxflow: wsi %p change_to %d\n",
+                                       wsi, wsi->u.ws.rxflow_change_to);
+
+       /* if we're letting it come again, did we interrupt anything? */
+       if ((wsi->u.ws.rxflow_change_to & 1) && wsi->u.ws.rxflow_buffer) {
+               n = libwebsocket_interpret_incoming_packet(wsi, NULL, 0);
+               if (n < 0) {
+                       lwsl_info("libwebsocket_rx_flow_control: close req\n");
+                       return -1;
+               }
+               if (n)
+                       /* oh he stuck again, do nothing */
+                       return 0;
+       }
+
+       if (wsi->u.ws.rxflow_change_to & 1)
+               context->fds[wsi->position_in_fds_table].events |= POLLIN;
+       else
+               context->fds[wsi->position_in_fds_table].events &= ~POLLIN;
+
+       if (wsi->u.ws.rxflow_change_to & 1)
+               /* external POLL support via protocol 0 */
+               context->protocols[0].callback(context, wsi,
+                       LWS_CALLBACK_SET_MODE_POLL_FD,
+                       wsi->user_space, (void *)(long)wsi->sock, POLLIN);
+       else
+               /* external POLL support via protocol 0 */
+               context->protocols[0].callback(context, wsi,
+                       LWS_CALLBACK_CLEAR_MODE_POLL_FD,
+                       wsi->user_space, (void *)(long)wsi->sock, POLLIN);
+
+       return 1;
+}
+#endif
+
+/**
+ * libwebsocket_rx_flow_control() - Enable and disable socket servicing for
+ *                             receieved packets.
+ *
+ * If the output side of a server process becomes choked, this allows flow
+ * control for the input side.
+ *
+ * @wsi:       Websocket connection instance to get callback for
+ * @enable:    0 = disable read servicing for this connection, 1 = enable
+ */
+
+int
+libwebsocket_rx_flow_control(struct libwebsocket *wsi, int enable)
+{
+       wsi->u.ws.rxflow_change_to = 2 | !!enable;
+
+       return 0;
+}
+
+
+/**
+ * libwebsocket_canonical_hostname() - returns this host's hostname
+ *
+ * This is typically used by client code to fill in the host parameter
+ * when making a client connection.  You can only call it after the context
+ * has been created.
+ *
+ * @context:   Websocket context
+ */
+
+
+extern const char *
+libwebsocket_canonical_hostname(struct libwebsocket_context *context)
+{
+       return (const char *)context->canonical_hostname;
+}
+
+
+static void sigpipe_handler(int x)
+{
+}
+
+#ifdef LWS_OPENSSL_SUPPORT
+static int
+OpenSSL_verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
+{
+
+       SSL *ssl;
+       int n;
+       struct libwebsocket_context *context;
+
+       ssl = X509_STORE_CTX_get_ex_data(x509_ctx,
+               SSL_get_ex_data_X509_STORE_CTX_idx());
+
+       /*
+        * !!! nasty openssl requires the index to come as a library-scope
+        * static
+        */
+       context = SSL_get_ex_data(ssl, openssl_websocket_private_data_index);
+
+       n = context->protocols[0].callback(NULL, NULL,
+               LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION,
+                                                  x509_ctx, ssl, preverify_ok);
+
+       /* convert return code from 0 = OK to 1 = OK */
+
+       if (!n)
+               n = 1;
+       else
+               n = 0;
+
+       return n;
+}
+#endif
+
+int user_callback_handle_rxflow(callback_function callback_function,
+               struct libwebsocket_context *context,
+                       struct libwebsocket *wsi,
+                        enum libwebsocket_callback_reasons reason, void *user,
+                                                         void *in, size_t len)
+{
+       int n;
+
+       n = callback_function(context, wsi, reason, user, in, len);
+       if (!n)
+               n = _libwebsocket_rx_flow_control(wsi);
+
+       return n;
+}
+
+
+/**
+ * libwebsocket_create_context() - Create the websocket handler
+ * @info:      pointer to struct with parameters
+ *
+ *     This function creates the listening socket (if serving) and takes care
+ *     of all initialization in one step.
+ *
+ *     After initialization, it returns a struct libwebsocket_context * that
+ *     represents this server.  After calling, user code needs to take care
+ *     of calling libwebsocket_service() with the context pointer to get the
+ *     server's sockets serviced.  This can be done in the same process context
+ *     or a forked process, or another thread,
+ *
+ *     The protocol callback functions are called for a handful of events
+ *     including http requests coming in, websocket connections becoming
+ *     established, and data arriving; it's also called periodically to allow
+ *     async transmission.
+ *
+ *     HTTP requests are sent always to the FIRST protocol in @protocol, since
+ *     at that time websocket protocol has not been negotiated.  Other
+ *     protocols after the first one never see any HTTP callack activity.
+ *
+ *     The server created is a simple http server by default; part of the
+ *     websocket standard is upgrading this http connection to a websocket one.
+ *
+ *     This allows the same server to provide files like scripts and favicon /
+ *     images or whatever over http and dynamic data over websockets all in
+ *     one place; they're all handled in the user callback.
+ */
+
+struct libwebsocket_context *
+libwebsocket_create_context(struct lws_context_creation_info *info)
+{
+       struct libwebsocket_context *context = NULL;
+       char *p;
+       int n;
+#ifndef LWS_NO_SERVER
+       int opt = 1;
+       struct libwebsocket *wsi;
+       struct sockaddr_in serv_addr;
+#endif
+#ifndef LWS_NO_EXTENSIONS
+       int m;
+       struct libwebsocket_extension *ext;
+#endif
+
+#ifdef LWS_OPENSSL_SUPPORT
+       SSL_METHOD *method;
+#endif
+
+#ifndef LWS_NO_DAEMONIZE
+       int pid_daemon = get_daemonize_pid();
+#endif
+
+       lwsl_notice("Initial logging level %d\n", log_level);
+       lwsl_notice("Library version: %s\n", library_version);
+       lwsl_info(" LWS_MAX_HEADER_LEN: %u\n", LWS_MAX_HEADER_LEN);
+       lwsl_info(" LWS_MAX_PROTOCOLS: %u\n", LWS_MAX_PROTOCOLS);
+#ifndef LWS_NO_EXTENSIONS
+       lwsl_info(" LWS_MAX_EXTENSIONS_ACTIVE: %u\n",
+                                               LWS_MAX_EXTENSIONS_ACTIVE);
+#else
+       lwsl_notice(" Configured without extension support\n");
+#endif
+       lwsl_info(" SPEC_LATEST_SUPPORTED: %u\n", SPEC_LATEST_SUPPORTED);
+       lwsl_info(" AWAITING_TIMEOUT: %u\n", AWAITING_TIMEOUT);
+       if (info->ssl_cipher_list)
+               lwsl_info(" SSL ciphers: '%s'\n", info->ssl_cipher_list);
+       lwsl_info(" SYSTEM_RANDOM_FILEPATH: '%s'\n", SYSTEM_RANDOM_FILEPATH);
+       lwsl_info(" LWS_MAX_ZLIB_CONN_BUFFER: %u\n", LWS_MAX_ZLIB_CONN_BUFFER);
+
+#ifdef _WIN32
+       {
+               WORD wVersionRequested;
+               WSADATA wsaData;
+               int err;
+               HMODULE wsdll;
+
+               /* Use the MAKEWORD(lowbyte, highbyte) macro from Windef.h */
+               wVersionRequested = MAKEWORD(2, 2);
+
+               err = WSAStartup(wVersionRequested, &wsaData);
+               if (err != 0) {
+                       /* Tell the user that we could not find a usable */
+                       /* Winsock DLL.                                  */
+                       lwsl_err("WSAStartup failed with error: %d\n", err);
+                       return NULL;
+               }
+
+               /* default to a poll() made out of select() */
+               poll = emulated_poll;
+
+               /* if windows socket lib available, use his WSAPoll */
+               wsdll = GetModuleHandle(_T("Ws2_32.dll"));
+               if (wsdll)
+                       poll = (PFNWSAPOLL)GetProcAddress(wsdll, "WSAPoll");
+
+               /* Finally fall back to emulated poll if all else fails */
+               if (!poll)
+                       poll = emulated_poll;
+       }
+#endif
+
+       context = (struct libwebsocket_context *)
+                               malloc(sizeof(struct libwebsocket_context));
+       if (!context) {
+               lwsl_err("No memory for websocket context\n");
+               return NULL;
+       }
+       memset(context, 0, sizeof(*context));
+#ifndef LWS_NO_DAEMONIZE
+       context->started_with_parent = pid_daemon;
+       lwsl_notice(" Started with daemon pid %d\n", pid_daemon);
+#endif
+
+       context->listen_service_extraseen = 0;
+       context->protocols = info->protocols;
+       context->listen_port = info->port;
+       context->http_proxy_port = 0;
+       context->http_proxy_address[0] = '\0';
+       context->options = info->options;
+       /* to reduce this allocation, */
+       context->max_fds = getdtablesize();
+       lwsl_notice(" static allocation: %u + (%u x %u fds) = %u bytes\n",
+               sizeof(struct libwebsocket_context),
+               sizeof(struct pollfd) + sizeof(struct libwebsocket *),
+               context->max_fds,
+               sizeof(struct libwebsocket_context) +
+               ((sizeof(struct pollfd) + sizeof(struct libwebsocket *)) *
+                                                            context->max_fds));
+
+       context->fds = (struct pollfd *)malloc(sizeof(struct pollfd) *
+                                                             context->max_fds);
+       if (context->fds == NULL) {
+               lwsl_err("Unable to allocate fds array for %d connections\n",
+                                                             context->max_fds);
+               free(context);
+               return NULL;
+       }
+       context->lws_lookup = (struct libwebsocket **)
+                     malloc(sizeof(struct libwebsocket *) * context->max_fds);
+       if (context->lws_lookup == NULL) {
+               lwsl_err(
+                 "Unable to allocate lws_lookup array for %d connections\n",
+                                                             context->max_fds);
+               free(context->fds);
+               free(context);
+               return NULL;
+       }
+
+       context->fds_count = 0;
+#ifndef LWS_NO_EXTENSIONS
+       context->extensions = info->extensions;
+#endif
+       context->last_timeout_check_s = 0;
+       context->user_space = info->user;
+
+#ifdef WIN32
+       context->fd_random = 0;
+#else
+       context->fd_random = open(SYSTEM_RANDOM_FILEPATH, O_RDONLY);
+       if (context->fd_random < 0) {
+               lwsl_err("Unable to open random device %s %d\n",
+                                   SYSTEM_RANDOM_FILEPATH, context->fd_random);
+               goto bail;
+       }
+#endif
+
+#ifdef LWS_OPENSSL_SUPPORT
+       context->use_ssl = 0;
+       context->ssl_ctx = NULL;
+       context->ssl_client_ctx = NULL;
+       openssl_websocket_private_data_index = 0;
+#endif
+
+       strcpy(context->canonical_hostname, "unknown");
+
+#ifndef LWS_NO_SERVER
+       if (!(info->options & LWS_SERVER_OPTION_SKIP_SERVER_CANONICAL_NAME)) {
+               /* find canonical hostname */
+               gethostname((char *)context->canonical_hostname,
+                                      sizeof(context->canonical_hostname) - 1);
+
+               lwsl_notice(" canonical_hostname = %s\n",
+                                       context->canonical_hostname);
+       }
+#endif
+
+       /* split the proxy ads:port if given */
+
+       p = getenv("http_proxy");
+       if (p && strlen(p)) {
+               strncpy(context->http_proxy_address, p,
+                                     sizeof(context->http_proxy_address) - 1);
+               context->http_proxy_address[
+                               sizeof(context->http_proxy_address) - 1] = '\0';
+
+               p = strchr(context->http_proxy_address, ':');
+               if (p == NULL) {
+                       lwsl_err("http_proxy needs to be ads:port\n");
+                       goto bail;
+               }
+               *p = '\0';
+               context->http_proxy_port = atoi(p + 1);
+
+               lwsl_notice(" Proxy %s:%u\n",
+                               context->http_proxy_address,
+                                                     context->http_proxy_port);
+       }
+
+#ifndef LWS_NO_SERVER
+       if (info->port) {
+
+#ifdef LWS_OPENSSL_SUPPORT
+               context->use_ssl = info->ssl_cert_filepath != NULL &&
+                                        info->ssl_private_key_filepath != NULL;
+#ifdef USE_CYASSL
+               lwsl_notice(" Compiled with CYASSL support\n");
+#else
+               lwsl_notice(" Compiled with OpenSSL support\n");
+#endif
+               if (context->use_ssl)
+                       lwsl_notice(" Using SSL mode\n");
+               else
+                       lwsl_notice(" Using non-SSL mode\n");
+
+#else
+               if (info->ssl_cert_filepath != NULL &&
+                                      info->ssl_private_key_filepath != NULL) {
+                       lwsl_notice(" Not compiled for OpenSSl support!\n");
+                       goto bail;
+               }
+               lwsl_notice(" Compiled without SSL support\n");
+#endif
+
+               lwsl_notice(
+                       " per-conn mem: %u + %u headers + protocol rx buf\n",
+                               sizeof(struct libwebsocket),
+                                             sizeof(struct allocated_headers));
+       }
+#endif
+
+       /* ignore SIGPIPE */
+#ifdef WIN32
+#else
+       signal(SIGPIPE, sigpipe_handler);
+#endif
+
+
+#ifdef LWS_OPENSSL_SUPPORT
+
+       /* basic openssl init */
+
+       SSL_library_init();
+
+       OpenSSL_add_all_algorithms();
+       SSL_load_error_strings();
+
+       openssl_websocket_private_data_index =
+               SSL_get_ex_new_index(0, "libwebsockets", NULL, NULL, NULL);
+
+       /*
+        * Firefox insists on SSLv23 not SSLv3
+        * Konq disables SSLv2 by default now, SSLv23 works
+        */
+
+       method = (SSL_METHOD *)SSLv23_server_method();
+       if (!method) {
+               lwsl_err("problem creating ssl method %lu: %s\n", 
+                       ERR_get_error(),
+                       ERR_error_string(ERR_get_error(),
+                                             (char *)context->service_buffer));
+               goto bail;
+       }
+       context->ssl_ctx = SSL_CTX_new(method); /* create context */
+       if (!context->ssl_ctx) {
+               lwsl_err("problem creating ssl context %lu: %s\n",
+                       ERR_get_error(),
+                       ERR_error_string(ERR_get_error(),
+                                             (char *)context->service_buffer));
+               goto bail;
+       }
+
+#ifdef SSL_OP_NO_COMPRESSION
+       SSL_CTX_set_options(context->ssl_ctx, SSL_OP_NO_COMPRESSION);
+#endif
+       SSL_CTX_set_options(context->ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
+       if (info->ssl_cipher_list)
+               SSL_CTX_set_cipher_list(context->ssl_ctx,
+                                               info->ssl_cipher_list);
+
+#ifndef LWS_NO_CLIENT
+
+       /* client context */
+
+       if (info->port == CONTEXT_PORT_NO_LISTEN) {
+               method = (SSL_METHOD *)SSLv23_client_method();
+               if (!method) {
+                       lwsl_err("problem creating ssl method %lu: %s\n",
+                               ERR_get_error(),
+                               ERR_error_string(ERR_get_error(),
+                                             (char *)context->service_buffer));
+                       goto bail;
+               }
+               /* create context */
+               context->ssl_client_ctx = SSL_CTX_new(method);
+               if (!context->ssl_client_ctx) {
+                       lwsl_err("problem creating ssl context %lu: %s\n",
+                               ERR_get_error(),
+                               ERR_error_string(ERR_get_error(),
+                                             (char *)context->service_buffer));
+                       goto bail;
+               }
+
+#ifdef SSL_OP_NO_COMPRESSION
+               SSL_CTX_set_options(context->ssl_client_ctx,
+                                                        SSL_OP_NO_COMPRESSION);
+#endif
+               SSL_CTX_set_options(context->ssl_client_ctx,
+                                              SSL_OP_CIPHER_SERVER_PREFERENCE);
+               if (info->ssl_cipher_list)
+                       SSL_CTX_set_cipher_list(context->ssl_client_ctx,
+                                                       info->ssl_cipher_list);
+
+               /* openssl init for cert verification (for client sockets) */
+               if (!info->ssl_ca_filepath) {
+                       if (!SSL_CTX_load_verify_locations(
+                               context->ssl_client_ctx, NULL,
+                                                    LWS_OPENSSL_CLIENT_CERTS))
+                               lwsl_err(
+                                   "Unable to load SSL Client certs from %s "
+                                   "(set by --with-client-cert-dir= "
+                                   "in configure) --  client ssl isn't "
+                                   "going to work", LWS_OPENSSL_CLIENT_CERTS);
+               } else
+                       if (!SSL_CTX_load_verify_locations(
+                               context->ssl_client_ctx, info->ssl_ca_filepath,
+                                                                 NULL))
+                               lwsl_err(
+                                       "Unable to load SSL Client certs "
+                                       "file from %s -- client ssl isn't "
+                                       "going to work", info->ssl_ca_filepath);
+
+               /*
+                * callback allowing user code to load extra verification certs
+                * helping the client to verify server identity
+                */
+
+               context->protocols[0].callback(context, NULL,
+                       LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS,
+                       context->ssl_client_ctx, NULL, 0);
+       }
+#endif
+
+       /* as a server, are we requiring clients to identify themselves? */
+
+       if (info->options &
+                       LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT) {
+
+               /* absolutely require the client cert */
+
+               SSL_CTX_set_verify(context->ssl_ctx,
+                      SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+                                                      OpenSSL_verify_callback);
+
+               /*
+                * give user code a chance to load certs into the server
+                * allowing it to verify incoming client certs
+                */
+
+               context->protocols[0].callback(context, NULL,
+                       LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS,
+                                                    context->ssl_ctx, NULL, 0);
+       }
+
+       if (context->use_ssl) {
+
+               /* openssl init for server sockets */
+
+               /* set the local certificate from CertFile */
+               n = SSL_CTX_use_certificate_chain_file(context->ssl_ctx,
+                                       info->ssl_cert_filepath);
+               if (n != 1) {
+                       lwsl_err("problem getting cert '%s' %lu: %s\n",
+                               info->ssl_cert_filepath,
+                               ERR_get_error(),
+                               ERR_error_string(ERR_get_error(),
+                                             (char *)context->service_buffer));
+                       goto bail;
+               }
+               /* set the private key from KeyFile */
+               if (SSL_CTX_use_PrivateKey_file(context->ssl_ctx,
+                            info->ssl_private_key_filepath,
+                                                      SSL_FILETYPE_PEM) != 1) {
+                       lwsl_err("ssl problem getting key '%s' %lu: %s\n",
+                               info->ssl_private_key_filepath,
+                                       ERR_get_error(),
+                                       ERR_error_string(ERR_get_error(),
+                                             (char *)context->service_buffer));
+                       goto bail;
+               }
+               /* verify private key */
+               if (!SSL_CTX_check_private_key(context->ssl_ctx)) {
+                       lwsl_err("Private SSL key doesn't match cert\n");
+                       goto bail;
+               }
+
+               /* SSL is happy and has a cert it's content with */
+       }
+#endif
+
+       /* selftest */
+
+       if (lws_b64_selftest())
+               goto bail;
+
+#ifndef LWS_NO_SERVER
+       /* set up our external listening socket we serve on */
+
+       if (info->port) {
+               int sockfd = -1;
+
+#ifdef HAVE_SYSTEMD_DAEMON
+               int const begin = SD_LISTEN_FDS_START;
+               int const end   = begin + sd_listen_fds(0);
+               int fd;
+
+               /*
+                * Check if we have a systemd activated socket we can
+                * use.  Otherwise explicitly create the socket.
+                */
+               for (fd = begin; fd < end; ++fd) {
+                       if (sd_is_socket_inet(fd,
+                                       AF_INET,
+                                       SOCK_STREAM,
+                                       1,  // check if in accepting mode
+                                       info->port)) {
+                               sockfd = fd;
+                               lwsl_notice("Systemd socket activation "
+                                           "succeeded.\n");
+                               break;
+                       }
+               }
+
+               if (sockfd == -1) {
+                       if (end > begin) {
+                               lwsl_warn("Systemd socket activation "
+                                         "failed.\n"
+                                         "Creating new socket instead.\n");
+                       }
+#endif /* HAVE_SYSTEMD_DAEMON */
+                       sockfd = socket(AF_INET, SOCK_STREAM, 0);
+                       if (sockfd < 0) {
+                               lwsl_err("ERROR opening socket\n");
+                               goto bail;
+                       }
+
+#ifndef WIN32
+                       /*
+                        * allow us to restart even if old sockets in TIME_WAIT
+                        * (REUSEADDR on Unix means, "don't hang on to this
+                        * address after the listener is closed."  On Windows, though,
+                        * it means "don't keep other processes from binding to
+                        * this address while we're using it)
+                        */
+                       setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
+                                             (const void *)&opt, sizeof(opt));
+#endif
+
+                       /* Disable Nagle */
+                       opt = 1;
+                       setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY,
+                                             (const void *)&opt, sizeof(opt));
+
+                       #ifdef WIN32
+                       opt = 0;
+                       ioctlsocket(sockfd, FIONBIO, (unsigned long *)&opt);
+                       #else
+                       fcntl(sockfd, F_SETFL, O_NONBLOCK);
+                       #endif
+
+                       bzero((char *) &serv_addr, sizeof(serv_addr));
+                       serv_addr.sin_family = AF_INET;
+                       if (info->iface == NULL)
+                               serv_addr.sin_addr.s_addr = INADDR_ANY;
+                       else
+                               interface_to_sa(info->iface, &serv_addr,
+                                               sizeof(serv_addr));
+                       serv_addr.sin_port = htons(info->port);
+
+                       n = bind(sockfd, (struct sockaddr *) &serv_addr,
+                                                            sizeof(serv_addr));
+                       if (n < 0) {
+                               lwsl_err("ERROR on binding to port %d (%d %d)\n",
+                                                       info->port, n, errno);
+                               close(sockfd);
+                               goto bail;
+                       }
+
+                       listen(sockfd, LWS_SOMAXCONN);
+#ifdef HAVE_SYSTEMD_DAEMON
+               }
+#endif /* HAVE_SYSTEMD_DAEMON */
+
+               wsi = (struct libwebsocket *)malloc(
+                                       sizeof(struct libwebsocket));
+               if (wsi == NULL) {
+                       lwsl_err("Out of mem\n");
+                       close(sockfd);
+                       goto bail;
+               }
+               memset(wsi, 0, sizeof(struct libwebsocket));
+               wsi->sock = sockfd;
+#ifndef LWS_NO_EXTENSIONS
+               wsi->count_active_extensions = 0;
+#endif
+               wsi->mode = LWS_CONNMODE_SERVER_LISTENER;
+
+               insert_wsi_socket_into_fds(context, wsi);
+
+               context->listen_service_modulo = LWS_LISTEN_SERVICE_MODULO;
+               context->listen_service_count = 0;
+               context->listen_service_fd = sockfd;
+
+               lwsl_notice(" Listening on port %d\n", info->port);
+       }
+
+#endif
+
+       /*
+        * drop any root privs for this process
+        * to listen on port < 1023 we would have needed root, but now we are
+        * listening, we don't want the power for anything else
+        */
+#ifdef WIN32
+#else
+       if (info->gid != -1)
+               if (setgid(info->gid))
+                       lwsl_warn("setgid: %s\n", strerror(errno));
+       if (info->uid != -1)
+               if (setuid(info->uid))
+                       lwsl_warn("setuid: %s\n", strerror(errno));
+#endif
+
+       /* initialize supported protocols */
+
+       for (context->count_protocols = 0;
+               info->protocols[context->count_protocols].callback;
+                                                  context->count_protocols++) {
+
+               lwsl_parser("  Protocol: %s\n",
+                               info->protocols[context->count_protocols].name);
+
+               info->protocols[context->count_protocols].owning_server =
+                                                                       context;
+               info->protocols[context->count_protocols].protocol_index =
+                                                      context->count_protocols;
+
+               /*
+                * inform all the protocols that they are doing their one-time
+                * initialization if they want to
+                */
+               info->protocols[context->count_protocols].callback(context,
+                              NULL, LWS_CALLBACK_PROTOCOL_INIT, NULL, NULL, 0);
+       }
+
+#ifndef LWS_NO_EXTENSIONS
+       /*
+        * give all extensions a chance to create any per-context
+        * allocations they need
+        */
+
+       m = LWS_EXT_CALLBACK_CLIENT_CONTEXT_CONSTRUCT;
+       if (info->port)
+               m = LWS_EXT_CALLBACK_SERVER_CONTEXT_CONSTRUCT;
+
+       if (info->extensions) {
+               ext = info->extensions;
+               while (ext->callback) {
+                       lwsl_ext("  Extension: %s\n", ext->name);
+                       ext->callback(context, ext, NULL,
+                       (enum libwebsocket_extension_callback_reasons)m,
+                                                               NULL, NULL, 0);
+                       ext++;
+               }
+       }
+#endif
+       return context;
+
+bail:
+       libwebsocket_context_destroy(context);
+       return NULL;
+}
+
+/**
+ * libwebsockets_get_protocol() - Returns a protocol pointer from a websocket
+ *                               connection.
+ * @wsi:       pointer to struct websocket you want to know the protocol of
+ *
+ *
+ *     Some apis can act on all live connections of a given protocol,
+ *     this is how you can get a pointer to the active protocol if needed.
+ */
+
+const struct libwebsocket_protocols *
+libwebsockets_get_protocol(struct libwebsocket *wsi)
+{
+       return wsi->protocol;
+}
+
+int
+libwebsocket_is_final_fragment(struct libwebsocket *wsi)
+{
+       return wsi->u.ws.final;
+}
+
+unsigned char
+libwebsocket_get_reserved_bits(struct libwebsocket *wsi)
+{
+       return wsi->u.ws.rsv;
+}
+
+int
+libwebsocket_ensure_user_space(struct libwebsocket *wsi)
+{
+       if (!wsi->protocol)
+               return 1;
+
+       /* allocate the per-connection user memory (if any) */
+
+       if (wsi->protocol->per_session_data_size && !wsi->user_space) {
+               wsi->user_space = malloc(
+                                 wsi->protocol->per_session_data_size);
+               if (wsi->user_space  == NULL) {
+                       lwsl_err("Out of memory for conn user space\n");
+                       return 1;
+               }
+               memset(wsi->user_space, 0,
+                                        wsi->protocol->per_session_data_size);
+       }
+       return 0;
+}
+
+static void lwsl_emit_stderr(int level, const char *line)
+{
+       char buf[300];
+       struct timeval tv;
+       int n;
+
+       gettimeofday(&tv, NULL);
+
+       buf[0] = '\0';
+       for (n = 0; n < LLL_COUNT; n++)
+               if (level == (1 << n)) {
+                       sprintf(buf, "[%ld:%04d] %s: ", tv.tv_sec,
+                               (int)(tv.tv_usec / 100), log_level_names[n]);
+                       break;
+               }
+
+       fprintf(stderr, "%s%s", buf, line);
+}
+
+#ifdef WIN32
+void lwsl_emit_syslog(int level, const char *line)
+{
+       lwsl_emit_stderr(level, line);
+}
+#else
+void lwsl_emit_syslog(int level, const char *line)
+{
+       int syslog_level = LOG_DEBUG;
+
+       switch (level) {
+       case LLL_ERR:
+               syslog_level = LOG_ERR;
+               break;
+       case LLL_WARN:
+               syslog_level = LOG_WARNING;
+               break;
+       case LLL_NOTICE:
+               syslog_level = LOG_NOTICE;
+               break;
+       case LLL_INFO:
+               syslog_level = LOG_INFO;
+               break;
+       }
+       syslog(syslog_level, "%s", line);
+}
+#endif
+
+void _lws_log(int filter, const char *format, ...)
+{
+       char buf[256];
+       va_list ap;
+
+       if (!(log_level & filter))
+               return;
+
+       va_start(ap, format);
+       vsnprintf(buf, sizeof(buf), format, ap);
+       buf[sizeof(buf) - 1] = '\0';
+       va_end(ap);
+
+       lwsl_emit(filter, buf);
+}
+
+/**
+ * lws_set_log_level() - Set the logging bitfield
+ * @level:     OR together the LLL_ debug contexts you want output from
+ * @log_emit_function: NULL to leave it as it is, or a user-supplied
+ *                     function to perform log string emission instead of
+ *                     the default stderr one.
+ *
+ *     log level defaults to "err", "warn" and "notice" contexts enabled and
+ *     emission on stderr.
+ */
+
+void lws_set_log_level(int level, void (*log_emit_function)(int level,
+                                                             const char *line))
+{
+       log_level = level;
+       if (log_emit_function)
+               lwsl_emit = log_emit_function;
+}
diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
new file mode 100644 (file)
index 0000000..28e649c
--- /dev/null
@@ -0,0 +1,977 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#ifndef __LIBWEBSOCKET_H__
+#define __LIBWEBSOCKET_H__
+
+#ifdef __cplusplus
+extern "C" {
+#include <cstddef>
+#endif
+
+#ifdef WIN32
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <stddef.h>
+#include "../win32port/win32helpers/websock-w32.h"
+
+#include "../win32port/win32helpers/gettimeofday.h"
+
+#define strcasecmp stricmp
+#define getdtablesize() 30000
+
+typedef int ssize_t;
+
+#ifdef LWS_DLL
+#ifdef LWS_INTERNAL
+#define LWS_EXTERN extern __declspec(dllexport)
+#else
+#define LWS_EXTERN extern __declspec(dllimport)
+#endif
+#endif
+
+#else // NOT WIN32
+#include <poll.h>
+#include <unistd.h>
+#endif
+
+#include <assert.h>
+
+#ifndef LWS_EXTERN
+#define LWS_EXTERN extern
+#endif
+
+#define CONTEXT_PORT_NO_LISTEN 0
+#define MAX_MUX_RECURSION 2
+
+enum lws_log_levels {
+       LLL_ERR = 1 << 0,
+       LLL_WARN = 1 << 1,
+       LLL_NOTICE = 1 << 2,
+       LLL_INFO = 1 << 3,
+       LLL_DEBUG = 1 << 4,
+       LLL_PARSER = 1 << 5,
+       LLL_HEADER = 1 << 6,
+       LLL_EXT = 1 << 7,
+       LLL_CLIENT = 1 << 8,
+       LLL_LATENCY = 1 << 9,
+
+       LLL_COUNT = 10 /* set to count of valid flags */
+};
+
+LWS_EXTERN void _lws_log(int filter, const char *format, ...);
+
+/* notice, warn and log are always compiled in */
+#define lwsl_notice(...) _lws_log(LLL_NOTICE, __VA_ARGS__)
+#define lwsl_warn(...) _lws_log(LLL_WARN, __VA_ARGS__)
+#define lwsl_err(...) _lws_log(LLL_ERR, __VA_ARGS__)
+/*
+ *  weaker logging can be deselected at configure time using --disable-debug
+ *  that gets rid of the overhead of checking while keeping _warn and _err
+ *  active
+ */
+#ifdef _DEBUG
+
+#define lwsl_info(...) _lws_log(LLL_INFO, __VA_ARGS__)
+#define lwsl_debug(...) _lws_log(LLL_DEBUG, __VA_ARGS__)
+#define lwsl_parser(...) _lws_log(LLL_PARSER, __VA_ARGS__)
+#define lwsl_header(...)  _lws_log(LLL_HEADER, __VA_ARGS__)
+#define lwsl_ext(...)  _lws_log(LLL_EXT, __VA_ARGS__)
+#define lwsl_client(...) _lws_log(LLL_CLIENT, __VA_ARGS__)
+#define lwsl_latency(...) _lws_log(LLL_LATENCY, __VA_ARGS__)
+LWS_EXTERN void lwsl_hexdump(void *buf, size_t len);
+
+#else /* no debug */
+
+#define lwsl_info(...)
+#define lwsl_debug(...)
+#define lwsl_parser(...)
+#define lwsl_header(...)
+#define lwsl_ext(...)
+#define lwsl_client(...)
+#define lwsl_latency(...)
+#define lwsl_hexdump(a, b)
+
+#endif
+
+enum libwebsocket_context_options {
+       LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT = 2,
+       LWS_SERVER_OPTION_SKIP_SERVER_CANONICAL_NAME = 4,
+};
+
+enum libwebsocket_callback_reasons {
+       LWS_CALLBACK_ESTABLISHED,
+       LWS_CALLBACK_CLIENT_CONNECTION_ERROR,
+       LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH,
+       LWS_CALLBACK_CLIENT_ESTABLISHED,
+       LWS_CALLBACK_CLOSED,
+       LWS_CALLBACK_RECEIVE,
+       LWS_CALLBACK_CLIENT_RECEIVE,
+       LWS_CALLBACK_CLIENT_RECEIVE_PONG,
+       LWS_CALLBACK_CLIENT_WRITEABLE,
+       LWS_CALLBACK_SERVER_WRITEABLE,
+       LWS_CALLBACK_HTTP,
+       LWS_CALLBACK_HTTP_FILE_COMPLETION,
+       LWS_CALLBACK_HTTP_WRITEABLE,
+       LWS_CALLBACK_FILTER_NETWORK_CONNECTION,
+       LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION,
+       LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS,
+       LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS,
+       LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION,
+       LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER,
+       LWS_CALLBACK_CONFIRM_EXTENSION_OKAY,
+       LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED,
+       LWS_CALLBACK_PROTOCOL_INIT,
+       LWS_CALLBACK_PROTOCOL_DESTROY,
+       /* external poll() management support */
+       LWS_CALLBACK_ADD_POLL_FD,
+       LWS_CALLBACK_DEL_POLL_FD,
+       LWS_CALLBACK_SET_MODE_POLL_FD,
+       LWS_CALLBACK_CLEAR_MODE_POLL_FD,
+};
+
+#ifndef LWS_NO_EXTENSIONS
+enum libwebsocket_extension_callback_reasons {
+       LWS_EXT_CALLBACK_SERVER_CONTEXT_CONSTRUCT,
+       LWS_EXT_CALLBACK_CLIENT_CONTEXT_CONSTRUCT,
+       LWS_EXT_CALLBACK_SERVER_CONTEXT_DESTRUCT,
+       LWS_EXT_CALLBACK_CLIENT_CONTEXT_DESTRUCT,
+       LWS_EXT_CALLBACK_CONSTRUCT,
+       LWS_EXT_CALLBACK_CLIENT_CONSTRUCT,
+       LWS_EXT_CALLBACK_CHECK_OK_TO_REALLY_CLOSE,
+       LWS_EXT_CALLBACK_CHECK_OK_TO_PROPOSE_EXTENSION,
+       LWS_EXT_CALLBACK_DESTROY,
+       LWS_EXT_CALLBACK_DESTROY_ANY_WSI_CLOSING,
+       LWS_EXT_CALLBACK_ANY_WSI_ESTABLISHED,
+       LWS_EXT_CALLBACK_PACKET_RX_PREPARSE,
+       LWS_EXT_CALLBACK_PACKET_TX_PRESEND,
+       LWS_EXT_CALLBACK_PACKET_TX_DO_SEND,
+       LWS_EXT_CALLBACK_HANDSHAKE_REPLY_TX,
+       LWS_EXT_CALLBACK_FLUSH_PENDING_TX,
+       LWS_EXT_CALLBACK_EXTENDED_PAYLOAD_RX,
+       LWS_EXT_CALLBACK_CAN_PROXY_CLIENT_CONNECTION,
+       LWS_EXT_CALLBACK_1HZ,
+       LWS_EXT_CALLBACK_REQUEST_ON_WRITEABLE,
+       LWS_EXT_CALLBACK_IS_WRITEABLE,
+       LWS_EXT_CALLBACK_PAYLOAD_TX,
+       LWS_EXT_CALLBACK_PAYLOAD_RX,
+};
+#endif
+
+enum libwebsocket_write_protocol {
+       LWS_WRITE_TEXT,
+       LWS_WRITE_BINARY,
+       LWS_WRITE_CONTINUATION,
+       LWS_WRITE_HTTP,
+
+       /* special 04+ opcodes */
+
+       LWS_WRITE_CLOSE,
+       LWS_WRITE_PING,
+       LWS_WRITE_PONG,
+
+       /* flags */
+
+       LWS_WRITE_NO_FIN = 0x40,
+       /*
+        * client packet payload goes out on wire unmunged
+        * only useful for security tests since normal servers cannot
+        * decode the content if used
+        */
+       LWS_WRITE_CLIENT_IGNORE_XOR_MASK = 0x80
+};
+
+/*
+ * you need these to look at headers that have been parsed if using the
+ * LWS_CALLBACK_FILTER_CONNECTION callback.  If a header from the enum
+ * list below is absent, .token = NULL and token_len = 0.  Otherwise .token
+ * points to .token_len chars containing that header content.
+ */
+
+struct lws_tokens {
+       char *token;
+       int token_len;
+};
+
+enum lws_token_indexes {
+       WSI_TOKEN_GET_URI,
+       WSI_TOKEN_HOST,
+       WSI_TOKEN_CONNECTION,
+       WSI_TOKEN_KEY1,
+       WSI_TOKEN_KEY2,
+       WSI_TOKEN_PROTOCOL,
+       WSI_TOKEN_UPGRADE,
+       WSI_TOKEN_ORIGIN,
+       WSI_TOKEN_DRAFT,
+       WSI_TOKEN_CHALLENGE,
+
+       /* new for 04 */
+       WSI_TOKEN_KEY,
+       WSI_TOKEN_VERSION,
+       WSI_TOKEN_SWORIGIN,
+
+       /* new for 05 */
+       WSI_TOKEN_EXTENSIONS,
+
+       /* client receives these */
+       WSI_TOKEN_ACCEPT,
+       WSI_TOKEN_NONCE,
+       WSI_TOKEN_HTTP,
+       WSI_TOKEN_MUXURL,
+
+       /* use token storage to stash these */
+
+       _WSI_TOKEN_CLIENT_SENT_PROTOCOLS,
+       _WSI_TOKEN_CLIENT_PEER_ADDRESS,
+       _WSI_TOKEN_CLIENT_URI,
+       _WSI_TOKEN_CLIENT_HOST,
+       _WSI_TOKEN_CLIENT_ORIGIN,
+
+       /* always last real token index*/
+       WSI_TOKEN_COUNT,
+       /* parser state additions */
+       WSI_TOKEN_NAME_PART,
+       WSI_TOKEN_SKIPPING,
+       WSI_TOKEN_SKIPPING_SAW_CR,
+       WSI_PARSING_COMPLETE,
+       WSI_INIT_TOKEN_MUXURL,
+};
+
+/*
+ * From RFC 6455
+   1000
+
+      1000 indicates a normal closure, meaning that the purpose for
+      which the connection was established has been fulfilled.
+
+   1001
+
+      1001 indicates that an endpoint is "going away", such as a server
+      going down or a browser having navigated away from a page.
+
+   1002
+
+      1002 indicates that an endpoint is terminating the connection due
+      to a protocol error.
+
+   1003
+
+      1003 indicates that an endpoint is terminating the connection
+      because it has received a type of data it cannot accept (e.g., an
+      endpoint that understands only text data MAY send this if it
+      receives a binary message).
+
+   1004
+
+      Reserved.  The specific meaning might be defined in the future.
+
+   1005
+
+      1005 is a reserved value and MUST NOT be set as a status code in a
+      Close control frame by an endpoint.  It is designated for use in
+      applications expecting a status code to indicate that no status
+      code was actually present.
+
+   1006
+
+      1006 is a reserved value and MUST NOT be set as a status code in a
+      Close control frame by an endpoint.  It is designated for use in
+      applications expecting a status code to indicate that the
+      connection was closed abnormally, e.g., without sending or
+      receiving a Close control frame.
+
+   1007
+
+      1007 indicates that an endpoint is terminating the connection
+      because it has received data within a message that was not
+      consistent with the type of the message (e.g., non-UTF-8 [RFC3629]
+      data within a text message).
+
+   1008
+
+      1008 indicates that an endpoint is terminating the connection
+      because it has received a message that violates its policy.  This
+      is a generic status code that can be returned when there is no
+      other more suitable status code (e.g., 1003 or 1009) or if there
+      is a need to hide specific details about the policy.
+
+   1009
+
+      1009 indicates that an endpoint is terminating the connection
+      because it has received a message that is too big for it to
+      process.
+
+   1010
+
+      1010 indicates that an endpoint (client) is terminating the
+      connection because it has expected the server to negotiate one or
+      more extension, but the server didn't return them in the response
+      message of the WebSocket handshake.  The list of extensions that
+      are needed SHOULD appear in the /reason/ part of the Close frame.
+      Note that this status code is not used by the server, because it
+      can fail the WebSocket handshake instead.
+
+   1011
+
+      1011 indicates that a server is terminating the connection because
+      it encountered an unexpected condition that prevented it from
+      fulfilling the request.
+
+   1015
+
+      1015 is a reserved value and MUST NOT be set as a status code in a
+      Close control frame by an endpoint.  It is designated for use in
+      applications expecting a status code to indicate that the
+      connection was closed due to a failure to perform a TLS handshake
+      (e.g., the server certificate can't be verified).
+*/
+
+enum lws_close_status {
+       LWS_CLOSE_STATUS_NOSTATUS = 0,
+       LWS_CLOSE_STATUS_NORMAL = 1000,
+       LWS_CLOSE_STATUS_GOINGAWAY = 1001,
+       LWS_CLOSE_STATUS_PROTOCOL_ERR = 1002,
+       LWS_CLOSE_STATUS_UNACCEPTABLE_OPCODE = 1003,
+       LWS_CLOSE_STATUS_RESERVED = 1004,
+       LWS_CLOSE_STATUS_NO_STATUS = 1005,
+       LWS_CLOSE_STATUS_ABNORMAL_CLOSE = 1006,
+       LWS_CLOSE_STATUS_INVALID_PAYLOAD = 1007,
+       LWS_CLOSE_STATUS_POLICY_VIOLATION = 1008,
+       LWS_CLOSE_STATUS_MESSAGE_TOO_LARGE = 1009,
+       LWS_CLOSE_STATUS_EXTENSION_REQUIRED = 1010,
+       LWS_CLOSE_STATUS_UNEXPECTED_CONDITION = 1011,
+       LWS_CLOSE_STATUS_TLS_FAILURE = 1015,
+};
+
+struct libwebsocket;
+struct libwebsocket_context;
+/* needed even with extensions disabled for create context */
+struct libwebsocket_extension;
+
+/**
+ * callback_function() - User server actions
+ * @context:   Websockets context
+ * @wsi:       Opaque websocket instance pointer
+ * @reason:    The reason for the call
+ * @user:      Pointer to per-session user data allocated by library
+ * @in:                Pointer used for some callback reasons
+ * @len:       Length set for some callback reasons
+ *
+ *     This callback is the way the user controls what is served.  All the
+ *     protocol detail is hidden and handled by the library.
+ *
+ *     For each connection / session there is user data allocated that is
+ *     pointed to by "user".  You set the size of this user data area when
+ *     the library is initialized with libwebsocket_create_server.
+ *
+ *     You get an opportunity to initialize user data when called back with
+ *     LWS_CALLBACK_ESTABLISHED reason.
+ *
+ *  LWS_CALLBACK_ESTABLISHED:  after the server completes a handshake with
+ *                             an incoming client
+ *
+ *  LWS_CALLBACK_CLIENT_CONNECTION_ERROR: the request client connection has
+ *        been unable to complete a handshake with the remote server
+ *
+ *  LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH: this is the last chance for the
+ *                             client user code to examine the http headers
+ *                             and decide to reject the connection.  If the
+ *                             content in the headers is interesting to the
+ *                             client (url, etc) it needs to copy it out at
+ *                             this point since it will be destroyed before
+ *                             the CLIENT_ESTABLISHED call
+ *
+ *  LWS_CALLBACK_CLIENT_ESTABLISHED: after your client connection completed
+ *                             a handshake with the remote server
+ *
+ *     LWS_CALLBACK_CLOSED: when the websocket session ends
+ *
+ *     LWS_CALLBACK_RECEIVE: data has appeared for this server endpoint from a
+ *                             remote client, it can be found at *in and is
+ *                             len bytes long
+ *
+ *     LWS_CALLBACK_CLIENT_RECEIVE_PONG: if you elected to see PONG packets,
+ *                             they appear with this callback reason.  PONG
+ *                             packets only exist in 04+ protocol
+ *
+ *     LWS_CALLBACK_CLIENT_RECEIVE: data has appeared from the server for the
+ *                             client connection, it can be found at *in and
+ *                             is len bytes long
+ *
+ *     LWS_CALLBACK_HTTP: an http request has come from a client that is not
+ *                             asking to upgrade the connection to a websocket
+ *                             one.  This is a chance to serve http content,
+ *                             for example, to send a script to the client
+ *                             which will then open the websockets connection.
+ *                             @in points to the URI path requested and
+ *                             libwebsockets_serve_http_file() makes it very
+ *                             simple to send back a file to the client.
+ *                             Normally after sending the file you are done
+ *                             with the http connection, since the rest of the
+ *                             activity will come by websockets from the script
+ *                             that was delivered by http, so you will want to
+ *                             return 1; to close and free up the connection.
+ *                             That's important because it uses a slot in the
+ *                             total number of client connections allowed set
+ *                             by MAX_CLIENTS.
+ *
+ *     LWS_CALLBACK_HTTP_WRITEABLE: you can write more down the http protocol
+ *             link now.
+ *
+ *     LWS_CALLBACK_HTTP_FILE_COMPLETION: a file requested to be send down
+ *                             http link has completed.
+ *
+ *     LWS_CALLBACK_CLIENT_WRITEABLE:
+ *      LWS_CALLBACK_SERVER_WRITEABLE:   If you call
+ *             libwebsocket_callback_on_writable() on a connection, you will
+ *             get one of these callbacks coming when the connection socket
+ *             is able to accept another write packet without blocking.
+ *             If it already was able to take another packet without blocking,
+ *             you'll get this callback at the next call to the service loop
+ *             function.  Notice that CLIENTs get LWS_CALLBACK_CLIENT_WRITEABLE
+ *             and servers get LWS_CALLBACK_SERVER_WRITEABLE.
+ *
+ *     LWS_CALLBACK_FILTER_NETWORK_CONNECTION: called when a client connects to
+ *             the server at network level; the connection is accepted but then
+ *             passed to this callback to decide whether to hang up immediately
+ *             or not, based on the client IP.  @in contains the connection
+ *             socket's descriptor.  Return non-zero to terminate
+ *             the connection before sending or receiving anything.
+ *             Because this happens immediately after the network connection
+ *             from the client, there's no websocket protocol selected yet so
+ *             this callback is issued only to protocol 0.
+ *
+ *     LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION: called when the handshake has
+ *             been received and parsed from the client, but the response is
+ *             not sent yet.  Return non-zero to disallow the connection.
+ *             @user is a pointer to an array of struct lws_tokens, you can
+ *             use the header enums lws_token_indexes from libwebsockets.h
+ *             to check for and read the supported header presence and
+ *             content before deciding to allow the handshake to proceed or
+ *             to kill the connection.
+ *
+ *     LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS: if configured for
+ *             including OpenSSL support, this callback allows your user code
+ *             to perform extra SSL_CTX_load_verify_locations() or similar
+ *             calls to direct OpenSSL where to find certificates the client
+ *             can use to confirm the remote server identity.  @user is the
+ *             OpenSSL SSL_CTX*
+ *
+ *     LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS: if configured for
+ *             including OpenSSL support, this callback allows your user code
+ *             to load extra certifcates into the server which allow it to
+ *             verify the validity of certificates returned by clients.  @user
+ *             is the server's OpenSSL SSL_CTX*
+ *
+ *     LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION: if the
+ *             libwebsockets context was created with the option
+ *             LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT, then this
+ *             callback is generated during OpenSSL verification of the cert
+ *             sent from the client.  It is sent to protocol[0] callback as
+ *             no protocol has been negotiated on the connection yet.
+ *             Notice that the libwebsockets context and wsi are both NULL
+ *             during this callback.  See
+ *              http://www.openssl.org/docs/ssl/SSL_CTX_set_verify.html
+ *             to understand more detail about the OpenSSL callback that
+ *             generates this libwebsockets callback and the meanings of the
+ *             arguments passed.  In this callback, @user is the x509_ctx,
+ *             @in is the ssl pointer and @len is preverify_ok
+ *             Notice that this callback maintains libwebsocket return
+ *             conventions, return 0 to mean the cert is OK or 1 to fail it.
+ *             This also means that if you don't handle this callback then
+ *             the default callback action of returning 0 allows the client
+ *             certificates.
+ *
+ *     LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER: this callback happens
+ *             when a client handshake is being compiled.  @user is NULL,
+ *             @in is a char **, it's pointing to a char * which holds the
+ *             next location in the header buffer where you can add
+ *             headers, and @len is the remaining space in the header buffer,
+ *             which is typically some hundreds of bytes.  So, to add a canned
+ *             cookie, your handler code might look similar to:
+ *
+ *             char **p = (char **)in;
+ *
+ *             if (len < 100)
+ *                     return 1;
+ *
+ *             *p += sprintf(*p, "Cookie: a=b\x0d\x0a");
+ *
+ *             return 0;
+ *
+ *             Notice if you add anything, you just have to take care about
+ *             the CRLF on the line you added.  Obviously this callback is
+ *             optional, if you don't handle it everything is fine.
+ *
+ *             Notice the callback is coming to protocols[0] all the time,
+ *             because there is no specific protocol handshook yet.
+ *
+ *     LWS_CALLBACK_CONFIRM_EXTENSION_OKAY: When the server handshake code
+ *             sees that it does support a requested extension, before
+ *             accepting the extension by additing to the list sent back to
+ *             the client it gives this callback just to check that it's okay
+ *             to use that extension.  It calls back to the requested protocol
+ *             and with @in being the extension name, @len is 0 and @user is
+ *             valid.  Note though at this time the ESTABLISHED callback hasn't
+ *             happened yet so if you initialize @user content there, @user
+ *             content during this callback might not be useful for anything.
+ *             Notice this callback comes to protocols[0].
+ *
+ *     LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED:        When a client
+ *             connection is being prepared to start a handshake to a server,
+ *             each supported extension is checked with protocols[0] callback
+ *             with this reason, giving the user code a chance to suppress the
+ *             claim to support that extension by returning non-zero.  If
+ *             unhandled, by default 0 will be returned and the extension
+ *             support included in the header to the server.  Notice this
+ *             callback comes to protocols[0].
+ *
+ *     LWS_CALLBACK_PROTOCOL_INIT:     One-time call per protocol so it can
+ *             do initial setup / allocations etc
+ *
+ *     LWS_CALLBACK_PROTOCOL_DESTROY:  One-time call per protocol indicating
+ *             this protocol won't get used at all after this callback, the
+ *             context is getting destroyed.  Take the opportunity to
+ *             deallocate everything that was allocated by the protocol.
+ *
+ *     The next four reasons are optional and only need taking care of if you
+ *     will be integrating libwebsockets sockets into an external polling
+ *     array.
+ *
+ *     LWS_CALLBACK_ADD_POLL_FD: libwebsocket deals with its poll() loop
+ *             internally, but in the case you are integrating with another
+ *             server you will need to have libwebsocket sockets share a
+ *             polling array with the other server.  This and the other
+ *             POLL_FD related callbacks let you put your specialized
+ *             poll array interface code in the callback for protocol 0, the
+ *             first protocol you support, usually the HTTP protocol in the
+ *             serving case.  This callback happens when a socket needs to be
+ *             added to the polling loop: @in contains the fd, and
+ *             @len is the events bitmap (like, POLLIN).  If you are using the
+ *             internal polling loop (the "service" callback), you can just
+ *             ignore these callbacks.
+ *
+ *     LWS_CALLBACK_DEL_POLL_FD: This callback happens when a socket descriptor
+ *             needs to be removed from an external polling array.  @in is
+ *             the socket desricptor.  If you are using the internal polling
+ *             loop, you can just ignore it.
+ *
+ *     LWS_CALLBACK_SET_MODE_POLL_FD: This callback happens when libwebsockets
+ *             wants to modify the events for the socket descriptor in @in.
+ *             The handler should OR @len on to the events member of the pollfd
+ *             struct for this socket descriptor.  If you are using the
+ *             internal polling loop, you can just ignore it.
+ *
+ *     LWS_CALLBACK_CLEAR_MODE_POLL_FD: This callback occurs when libwebsockets
+ *             wants to modify the events for the socket descriptor in @in.
+ *             The handler should AND ~@len on to the events member of the
+ *             pollfd struct for this socket descriptor.  If you are using the
+ *             internal polling loop, you can just ignore it.
+ */
+LWS_EXTERN int callback(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi,
+                        enum libwebsocket_callback_reasons reason, void *user,
+                                                         void *in, size_t len);
+
+typedef int (callback_function)(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi,
+                        enum libwebsocket_callback_reasons reason, void *user,
+                                                         void *in, size_t len);
+
+#ifndef LWS_NO_EXTENSIONS
+/**
+ * extension_callback_function() - Hooks to allow extensions to operate
+ * @context:   Websockets context
+ * @ext:       This extension
+ * @wsi:       Opaque websocket instance pointer
+ * @reason:    The reason for the call
+ * @user:      Pointer to per-session user data allocated by library
+ * @in:                Pointer used for some callback reasons
+ * @len:       Length set for some callback reasons
+ *
+ *     Each extension that is active on a particular connection receives
+ *     callbacks during the connection lifetime to allow the extension to
+ *     operate on websocket data and manage itself.
+ *
+ *     Libwebsockets takes care of allocating and freeing "user" memory for
+ *     each active extension on each connection.  That is what is pointed to
+ *     by the @user parameter.
+ *
+ *     LWS_EXT_CALLBACK_CONSTRUCT:  called when the server has decided to
+ *             select this extension from the list provided by the client,
+ *             just before the server will send back the handshake accepting
+ *             the connection with this extension active.  This gives the
+ *             extension a chance to initialize its connection context found
+ *             in @user.
+ *
+ *     LWS_EXT_CALLBACK_CLIENT_CONSTRUCT: same as LWS_EXT_CALLBACK_CONSTRUCT
+ *             but called when client is instantiating this extension.  Some
+ *             extensions will work the same on client and server side and then
+ *             you can just merge handlers for both CONSTRUCTS.
+ *
+ *     LWS_EXT_CALLBACK_DESTROY:  called when the connection the extension was
+ *             being used on is about to be closed and deallocated.  It's the
+ *             last chance for the extension to deallocate anything it has
+ *             allocated in the user data (pointed to by @user) before the
+ *             user data is deleted.  This same callback is used whether you
+ *             are in client or server instantiation context.
+ *
+ *     LWS_EXT_CALLBACK_PACKET_RX_PREPARSE: when this extension was active on
+ *             a connection, and a packet of data arrived at the connection,
+ *             it is passed to this callback to give the extension a chance to
+ *             change the data, eg, decompress it.  @user is pointing to the
+ *             extension's private connection context data, @in is pointing
+ *             to an lws_tokens struct, it consists of a char * pointer called
+ *             token, and an int called token_len.  At entry, these are
+ *             set to point to the received buffer and set to the content
+ *             length.  If the extension will grow the content, it should use
+ *             a new buffer allocated in its private user context data and
+ *             set the pointed-to lws_tokens members to point to its buffer.
+ *
+ *     LWS_EXT_CALLBACK_PACKET_TX_PRESEND: this works the same way as
+ *             LWS_EXT_CALLBACK_PACKET_RX_PREPARSE above, except it gives the
+ *             extension a chance to change websocket data just before it will
+ *             be sent out.  Using the same lws_token pointer scheme in @in,
+ *             the extension can change the buffer and the length to be
+ *             transmitted how it likes.  Again if it wants to grow the
+ *             buffer safely, it should copy the data into its own buffer and
+ *             set the lws_tokens token pointer to it.
+ */
+LWS_EXTERN int extension_callback(struct libwebsocket_context *context,
+                       struct libwebsocket_extension *ext,
+                       struct libwebsocket *wsi,
+                       enum libwebsocket_extension_callback_reasons reason,
+                       void *user, void *in, size_t len);
+
+typedef int (extension_callback_function)(struct libwebsocket_context *context,
+                       struct libwebsocket_extension *ext,
+                       struct libwebsocket *wsi,
+                       enum libwebsocket_extension_callback_reasons reason,
+                       void *user, void *in, size_t len);
+#endif
+
+/**
+ * struct libwebsocket_protocols -     List of protocols and handlers server
+ *                                     supports.
+ * @name:      Protocol name that must match the one given in the client
+ *             Javascript new WebSocket(url, 'protocol') name
+ * @callback:  The service callback used for this protocol.  It allows the
+ *             service action for an entire protocol to be encapsulated in
+ *             the protocol-specific callback
+ * @per_session_data_size:     Each new connection using this protocol gets
+ *             this much memory allocated on connection establishment and
+ *             freed on connection takedown.  A pointer to this per-connection
+ *             allocation is passed into the callback in the 'user' parameter
+ * @rx_buffer_size: if you want atomic frames delivered to the callback, you
+ *             should set this to the size of the biggest legal frame that
+ *             you support.  If the frame size is exceeded, there is no
+ *             error, but the buffer will spill to the user callback when
+ *             full, which you can detect by using
+ *             libwebsockets_remaining_packet_payload().  Notice that you
+ *             just talk about frame size here, the LWS_SEND_BUFFER_PRE_PADDING
+ *             and post-padding are automatically also allocated on top.
+ * @owning_server:     the server init call fills in this opaque pointer when
+ *             registering this protocol with the server.
+ * @protocol_index: which protocol we are starting from zero
+ *
+ *     This structure represents one protocol supported by the server.  An
+ *     array of these structures is passed to libwebsocket_create_server()
+ *     allows as many protocols as you like to be handled by one server.
+ */
+
+struct libwebsocket_protocols {
+       const char *name;
+       callback_function *callback;
+       size_t per_session_data_size;
+       size_t rx_buffer_size;
+
+       /*
+        * below are filled in on server init and can be left uninitialized,
+        * no need for user to use them directly either
+        */
+
+       struct libwebsocket_context *owning_server;
+       int protocol_index;
+};
+
+#ifndef LWS_NO_EXTENSIONS
+/**
+ * struct libwebsocket_extension -     An extension we know how to cope with
+ *
+ * @name:                      Formal extension name, eg, "deflate-stream"
+ * @callback:                  Service callback
+ * @per_session_data_size:     Libwebsockets will auto-malloc this much
+ *                             memory for the use of the extension, a pointer
+ *                             to it comes in the @user callback parameter
+ * @per_context_private_data:   Optional storage for this extension that
+ *                             is per-context, so it can track stuff across
+ *                             all sessions, etc, if it wants
+ */
+
+struct libwebsocket_extension {
+       const char *name;
+       extension_callback_function *callback;
+       size_t per_session_data_size;
+       void *per_context_private_data;
+};
+#endif
+
+/**
+ * struct lws_context_creation_info: parameters to create context with
+ *
+ * @port:      Port to listen on... you can use 0 to suppress listening on
+ *             any port, that's what you want if you are not running a
+ *             websocket server at all but just using it as a client
+ * @iface:     NULL to bind the listen socket to all interfaces, or the
+ *             interface name, eg, "eth2"
+ * @protocols: Array of structures listing supported protocols and a protocol-
+ *             specific callback for each one.  The list is ended with an
+ *             entry that has a NULL callback pointer.
+ *             It's not const because we write the owning_server member
+ * @extensions: NULL or array of libwebsocket_extension structs listing the
+ *             extensions this context supports.  If you configured with
+ *             --without-extensions, you should give NULL here.
+ * @ssl_cert_filepath: If libwebsockets was compiled to use ssl, and you want
+ *                     to listen using SSL, set to the filepath to fetch the
+ *                     server cert from, otherwise NULL for unencrypted
+ * @ssl_private_key_filepath: filepath to private key if wanting SSL mode,
+ *                     else ignored
+ * @ssl_ca_filepath: CA certificate filepath or NULL
+ * @ssl_cipher_list:   List of valid ciphers to use (eg,
+ *                     "RC4-MD5:RC4-SHA:AES128-SHA:AES256-SHA:HIGH:!DSS:!aNULL"
+ *                     or you can leave it as NULL to get "DEFAULT"
+ * @gid:       group id to change to after setting listen socket, or -1.
+ * @uid:       user id to change to after setting listen socket, or -1.
+ * @options:   0, or LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK
+ * @user:      optional user pointer that can be recovered via the context
+ *             pointer using libwebsocket_context_user
+ * @ka_time:   0 for no keepalive, otherwise apply this keepalive timeout to
+ *             all libwebsocket sockets, client or server
+ * @ka_probes: if ka_time was nonzero, after the timeout expires how many
+ *             times to try to get a response from the peer before giving up
+ *             and killing the connection
+ * @ka_interval: if ka_time was nonzero, how long to wait before each ka_probes
+ *             attempt
+ */
+
+struct lws_context_creation_info {
+       int port;
+       const char *iface;
+       struct libwebsocket_protocols *protocols;
+       struct libwebsocket_extension *extensions;
+       const char *ssl_cert_filepath;
+       const char *ssl_private_key_filepath;
+       const char *ssl_ca_filepath;
+       const char *ssl_cipher_list;
+       int gid;
+       int uid;
+       unsigned int options;
+       void *user;
+       int ka_time;
+       int ka_probes;
+       int ka_interval;
+
+};
+
+LWS_EXTERN
+void lws_set_log_level(int level,
+                       void (*log_emit_function)(int level, const char *line));
+
+LWS_EXTERN void
+lwsl_emit_syslog(int level, const char *line);
+
+LWS_EXTERN struct libwebsocket_context *
+libwebsocket_create_context(struct lws_context_creation_info *info);
+
+LWS_EXTERN void
+libwebsocket_context_destroy(struct libwebsocket_context *context);
+
+LWS_EXTERN int
+libwebsocket_service(struct libwebsocket_context *context, int timeout_ms);
+
+LWS_EXTERN int
+libwebsocket_service_fd(struct libwebsocket_context *context,
+                                                        struct pollfd *pollfd);
+
+LWS_EXTERN void *
+libwebsocket_context_user(struct libwebsocket_context *context);
+
+/*
+ * IMPORTANT NOTICE!
+ *
+ * When sending with websocket protocol (LWS_WRITE_TEXT or LWS_WRITE_BINARY)
+ * the send buffer has to have LWS_SEND_BUFFER_PRE_PADDING bytes valid BEFORE
+ * buf, and LWS_SEND_BUFFER_POST_PADDING bytes valid AFTER (buf + len).
+ *
+ * This allows us to add protocol info before and after the data, and send as
+ * one packet on the network without payload copying, for maximum efficiency.
+ *
+ * So for example you need this kind of code to use libwebsocket_write with a
+ * 128-byte payload
+ *
+ *   char buf[LWS_SEND_BUFFER_PRE_PADDING + 128 + LWS_SEND_BUFFER_POST_PADDING];
+ *
+ *   // fill your part of the buffer... for example here it's all zeros
+ *   memset(&buf[LWS_SEND_BUFFER_PRE_PADDING], 0, 128);
+ *
+ *   libwebsocket_write(wsi, &buf[LWS_SEND_BUFFER_PRE_PADDING], 128);
+ *
+ * When sending LWS_WRITE_HTTP, there is no protocol addition and you can just
+ * use the whole buffer without taking care of the above.
+ */
+
+/*
+ * this is the frame nonce plus two header plus 8 length
+ *   there's an additional two for mux extension per mux nesting level
+ * 2 byte prepend on close will already fit because control frames cannot use
+ * the big length style
+ */
+
+#define LWS_SEND_BUFFER_PRE_PADDING (4 + 10 + (2 * MAX_MUX_RECURSION))
+#define LWS_SEND_BUFFER_POST_PADDING 4
+
+LWS_EXTERN int
+libwebsocket_write(struct libwebsocket *wsi, unsigned char *buf, size_t len,
+                                    enum libwebsocket_write_protocol protocol);
+
+LWS_EXTERN int
+libwebsockets_serve_http_file(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi, const char *file,
+                                                    const char *content_type);
+LWS_EXTERN int
+libwebsockets_serve_http_file_fragment(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi);
+
+LWS_EXTERN const struct libwebsocket_protocols *
+libwebsockets_get_protocol(struct libwebsocket *wsi);
+
+LWS_EXTERN int
+libwebsocket_callback_on_writable(struct libwebsocket_context *context,
+                                                     struct libwebsocket *wsi);
+
+LWS_EXTERN int
+libwebsocket_callback_on_writable_all_protocol(
+                                const struct libwebsocket_protocols *protocol);
+
+LWS_EXTERN int
+libwebsocket_get_socket_fd(struct libwebsocket *wsi);
+
+LWS_EXTERN int
+libwebsocket_is_final_fragment(struct libwebsocket *wsi);
+
+LWS_EXTERN unsigned char
+libwebsocket_get_reserved_bits(struct libwebsocket *wsi);
+
+LWS_EXTERN int
+libwebsocket_rx_flow_control(struct libwebsocket *wsi, int enable);
+
+LWS_EXTERN size_t
+libwebsockets_remaining_packet_payload(struct libwebsocket *wsi);
+
+LWS_EXTERN struct libwebsocket *
+libwebsocket_client_connect(struct libwebsocket_context *clients,
+                             const char *address,
+                             int port,
+                             int ssl_connection,
+                             const char *path,
+                             const char *host,
+                             const char *origin,
+                             const char *protocol,
+                             int ietf_version_or_minus_one);
+
+LWS_EXTERN struct libwebsocket *
+libwebsocket_client_connect_extended(struct libwebsocket_context *clients,
+                             const char *address,
+                             int port,
+                             int ssl_connection,
+                             const char *path,
+                             const char *host,
+                             const char *origin,
+                             const char *protocol,
+                             int ietf_version_or_minus_one,
+                             void *userdata);
+
+LWS_EXTERN const char *
+libwebsocket_canonical_hostname(struct libwebsocket_context *context);
+
+
+LWS_EXTERN void
+libwebsockets_get_peer_addresses(struct libwebsocket_context *context,
+               struct libwebsocket *wsi, int fd, char *name, int name_len,
+                                       char *rip, int rip_len);
+
+LWS_EXTERN int
+libwebsockets_get_random(struct libwebsocket_context *context,
+                                                           void *buf, int len);
+
+LWS_EXTERN int
+lws_daemonize(const char *_lock_path);
+
+LWS_EXTERN int
+lws_send_pipe_choked(struct libwebsocket *wsi);
+
+LWS_EXTERN int
+lws_frame_is_binary(struct libwebsocket *wsi);
+
+LWS_EXTERN unsigned char *
+libwebsockets_SHA1(const unsigned char *d, size_t n, unsigned char *md);
+
+LWS_EXTERN int
+lws_b64_encode_string(const char *in, int in_len, char *out, int out_size);
+
+LWS_EXTERN int
+lws_b64_decode_string(const char *in, char *out, int out_size);
+
+LWS_EXTERN const char *
+lws_get_library_version(void);
+
+/* access to headers... only valid while headers valid */
+
+LWS_EXTERN int
+lws_hdr_total_length(struct libwebsocket *wsi, enum lws_token_indexes h);
+
+LWS_EXTERN int
+lws_hdr_copy(struct libwebsocket *wsi, char *dest, int len,
+                                               enum lws_token_indexes h);
+
+/*
+ * Note: this is not normally needed as a user api.  It's provided in case it is
+ * useful when integrating with other app poll loop service code.
+ */
+
+LWS_EXTERN int
+libwebsocket_read(struct libwebsocket_context *context,
+                               struct libwebsocket *wsi,
+                                              unsigned char *buf, size_t len);
+
+#ifndef LWS_NO_EXTENSIONS
+LWS_EXTERN struct libwebsocket_extension *libwebsocket_get_internal_extensions();
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/lib/minilex.c b/lib/minilex.c
new file mode 100644 (file)
index 0000000..4912ad6
--- /dev/null
@@ -0,0 +1,440 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+const char *set[] = {
+       "GET ",
+       "Host:",
+       "Connection:",
+       "Sec-WebSocket-Key1:",
+       "Sec-WebSocket-Key2:",
+       "Sec-WebSocket-Protocol:",
+       "Upgrade:",
+       "Origin:",
+       "Sec-WebSocket-Draft:",
+       "\x0d\x0a",
+
+       "Sec-WebSocket-Key:",
+       "Sec-WebSocket-Version:",
+       "Sec-WebSocket-Origin:",
+
+       "Sec-WebSocket-Extensions:",
+
+       "Sec-WebSocket-Accept:",
+       "Sec-WebSocket-Nonce:",
+       "HTTP/1.1 ",
+};
+
+unsigned char lextable[] = {
+/* pos 0: state 0 */
+   0x47 /* 'G' */, 0x07 /* to pos 14 state 1 */,
+   0x48 /* 'H' */, 0x0A /* to pos 22 state 5 */,
+   0x43 /* 'C' */, 0x0F /* to pos 34 state 10 */,
+   0x53 /* 'S' */, 0x19 /* to pos 56 state 21 */,
+   0x55 /* 'U' */, 0x3F /* to pos 134 state 51 */,
+   0x4F /* 'O' */, 0x46 /* to pos 150 state 59 */,
+   0x8D /* '.' */, 0x52 /* to pos 176 state 72 */,
+/* pos 14: state 1 */
+   0xC5 /* 'E' */, 0x01 /* to pos 16 state 2 */,
+/* pos 16: state 2 */
+   0xD4 /* 'T' */, 0x01 /* to pos 18 state 3 */,
+/* pos 18: state 3 */
+   0xA0 /* ' ' */, 0x01 /* to pos 20 state 4 */,
+/* pos 20: state 4 */
+   0x80, 0x00 /* terminal marker */, 
+/* pos 22: state 5 */
+   0x6F /* 'o' */, 0x02 /* to pos 26 state 6 */,
+   0xD4 /* 'T' */, 0x76 /* to pos 260 state 114 */,
+/* pos 26: state 6 */
+   0xF3 /* 's' */, 0x01 /* to pos 28 state 7 */,
+/* pos 28: state 7 */
+   0xF4 /* 't' */, 0x01 /* to pos 30 state 8 */,
+/* pos 30: state 8 */
+   0xBA /* ':' */, 0x01 /* to pos 32 state 9 */,
+/* pos 32: state 9 */
+   0x81, 0x00 /* terminal marker */, 
+/* pos 34: state 10 */
+   0xEF /* 'o' */, 0x01 /* to pos 36 state 11 */,
+/* pos 36: state 11 */
+   0xEE /* 'n' */, 0x01 /* to pos 38 state 12 */,
+/* pos 38: state 12 */
+   0xEE /* 'n' */, 0x01 /* to pos 40 state 13 */,
+/* pos 40: state 13 */
+   0xE5 /* 'e' */, 0x01 /* to pos 42 state 14 */,
+/* pos 42: state 14 */
+   0xE3 /* 'c' */, 0x01 /* to pos 44 state 15 */,
+/* pos 44: state 15 */
+   0xF4 /* 't' */, 0x01 /* to pos 46 state 16 */,
+/* pos 46: state 16 */
+   0xE9 /* 'i' */, 0x01 /* to pos 48 state 17 */,
+/* pos 48: state 17 */
+   0xEF /* 'o' */, 0x01 /* to pos 50 state 18 */,
+/* pos 50: state 18 */
+   0xEE /* 'n' */, 0x01 /* to pos 52 state 19 */,
+/* pos 52: state 19 */
+   0xBA /* ':' */, 0x01 /* to pos 54 state 20 */,
+/* pos 54: state 20 */
+   0x82, 0x00 /* terminal marker */, 
+/* pos 56: state 21 */
+   0xE5 /* 'e' */, 0x01 /* to pos 58 state 22 */,
+/* pos 58: state 22 */
+   0xE3 /* 'c' */, 0x01 /* to pos 60 state 23 */,
+/* pos 60: state 23 */
+   0xAD /* '-' */, 0x01 /* to pos 62 state 24 */,
+/* pos 62: state 24 */
+   0xD7 /* 'W' */, 0x01 /* to pos 64 state 25 */,
+/* pos 64: state 25 */
+   0xE5 /* 'e' */, 0x01 /* to pos 66 state 26 */,
+/* pos 66: state 26 */
+   0xE2 /* 'b' */, 0x01 /* to pos 68 state 27 */,
+/* pos 68: state 27 */
+   0xD3 /* 'S' */, 0x01 /* to pos 70 state 28 */,
+/* pos 70: state 28 */
+   0xEF /* 'o' */, 0x01 /* to pos 72 state 29 */,
+/* pos 72: state 29 */
+   0xE3 /* 'c' */, 0x01 /* to pos 74 state 30 */,
+/* pos 74: state 30 */
+   0xEB /* 'k' */, 0x01 /* to pos 76 state 31 */,
+/* pos 76: state 31 */
+   0xE5 /* 'e' */, 0x01 /* to pos 78 state 32 */,
+/* pos 78: state 32 */
+   0xF4 /* 't' */, 0x01 /* to pos 80 state 33 */,
+/* pos 80: state 33 */
+   0xAD /* '-' */, 0x01 /* to pos 82 state 34 */,
+/* pos 82: state 34 */
+   0x4B /* 'K' */, 0x08 /* to pos 98 state 35 */,
+   0x50 /* 'P' */, 0x10 /* to pos 116 state 42 */,
+   0x44 /* 'D' */, 0x27 /* to pos 164 state 66 */,
+   0x56 /* 'V' */, 0x2F /* to pos 182 state 75 */,
+   0x4F /* 'O' */, 0x36 /* to pos 198 state 83 */,
+   0x45 /* 'E' */, 0x3C /* to pos 212 state 90 */,
+   0x41 /* 'A' */, 0x46 /* to pos 234 state 101 */,
+   0xCE /* 'N' */, 0x4C /* to pos 248 state 108 */,
+/* pos 98: state 35 */
+   0xE5 /* 'e' */, 0x01 /* to pos 100 state 36 */,
+/* pos 100: state 36 */
+   0xF9 /* 'y' */, 0x01 /* to pos 102 state 37 */,
+/* pos 102: state 37 */
+   0x31 /* '1' */, 0x03 /* to pos 108 state 38 */,
+   0x32 /* '2' */, 0x04 /* to pos 112 state 40 */,
+   0xBA /* ':' */, 0x25 /* to pos 180 state 74 */,
+/* pos 108: state 38 */
+   0xBA /* ':' */, 0x01 /* to pos 110 state 39 */,
+/* pos 110: state 39 */
+   0x83, 0x00 /* terminal marker */, 
+/* pos 112: state 40 */
+   0xBA /* ':' */, 0x01 /* to pos 114 state 41 */,
+/* pos 114: state 41 */
+   0x84, 0x00 /* terminal marker */, 
+/* pos 116: state 42 */
+   0xF2 /* 'r' */, 0x01 /* to pos 118 state 43 */,
+/* pos 118: state 43 */
+   0xEF /* 'o' */, 0x01 /* to pos 120 state 44 */,
+/* pos 120: state 44 */
+   0xF4 /* 't' */, 0x01 /* to pos 122 state 45 */,
+/* pos 122: state 45 */
+   0xEF /* 'o' */, 0x01 /* to pos 124 state 46 */,
+/* pos 124: state 46 */
+   0xE3 /* 'c' */, 0x01 /* to pos 126 state 47 */,
+/* pos 126: state 47 */
+   0xEF /* 'o' */, 0x01 /* to pos 128 state 48 */,
+/* pos 128: state 48 */
+   0xEC /* 'l' */, 0x01 /* to pos 130 state 49 */,
+/* pos 130: state 49 */
+   0xBA /* ':' */, 0x01 /* to pos 132 state 50 */,
+/* pos 132: state 50 */
+   0x85, 0x00 /* terminal marker */, 
+/* pos 134: state 51 */
+   0xF0 /* 'p' */, 0x01 /* to pos 136 state 52 */,
+/* pos 136: state 52 */
+   0xE7 /* 'g' */, 0x01 /* to pos 138 state 53 */,
+/* pos 138: state 53 */
+   0xF2 /* 'r' */, 0x01 /* to pos 140 state 54 */,
+/* pos 140: state 54 */
+   0xE1 /* 'a' */, 0x01 /* to pos 142 state 55 */,
+/* pos 142: state 55 */
+   0xE4 /* 'd' */, 0x01 /* to pos 144 state 56 */,
+/* pos 144: state 56 */
+   0xE5 /* 'e' */, 0x01 /* to pos 146 state 57 */,
+/* pos 146: state 57 */
+   0xBA /* ':' */, 0x01 /* to pos 148 state 58 */,
+/* pos 148: state 58 */
+   0x86, 0x00 /* terminal marker */, 
+/* pos 150: state 59 */
+   0xF2 /* 'r' */, 0x01 /* to pos 152 state 60 */,
+/* pos 152: state 60 */
+   0xE9 /* 'i' */, 0x01 /* to pos 154 state 61 */,
+/* pos 154: state 61 */
+   0xE7 /* 'g' */, 0x01 /* to pos 156 state 62 */,
+/* pos 156: state 62 */
+   0xE9 /* 'i' */, 0x01 /* to pos 158 state 63 */,
+/* pos 158: state 63 */
+   0xEE /* 'n' */, 0x01 /* to pos 160 state 64 */,
+/* pos 160: state 64 */
+   0xBA /* ':' */, 0x01 /* to pos 162 state 65 */,
+/* pos 162: state 65 */
+   0x87, 0x00 /* terminal marker */, 
+/* pos 164: state 66 */
+   0xF2 /* 'r' */, 0x01 /* to pos 166 state 67 */,
+/* pos 166: state 67 */
+   0xE1 /* 'a' */, 0x01 /* to pos 168 state 68 */,
+/* pos 168: state 68 */
+   0xE6 /* 'f' */, 0x01 /* to pos 170 state 69 */,
+/* pos 170: state 69 */
+   0xF4 /* 't' */, 0x01 /* to pos 172 state 70 */,
+/* pos 172: state 70 */
+   0xBA /* ':' */, 0x01 /* to pos 174 state 71 */,
+/* pos 174: state 71 */
+   0x88, 0x00 /* terminal marker */, 
+/* pos 176: state 72 */
+   0x8A /* '.' */, 0x01 /* to pos 178 state 73 */,
+/* pos 178: state 73 */
+   0x89, 0x00 /* terminal marker */, 
+/* pos 180: state 74 */
+   0x8A, 0x00 /* terminal marker */, 
+/* pos 182: state 75 */
+   0xE5 /* 'e' */, 0x01 /* to pos 184 state 76 */,
+/* pos 184: state 76 */
+   0xF2 /* 'r' */, 0x01 /* to pos 186 state 77 */,
+/* pos 186: state 77 */
+   0xF3 /* 's' */, 0x01 /* to pos 188 state 78 */,
+/* pos 188: state 78 */
+   0xE9 /* 'i' */, 0x01 /* to pos 190 state 79 */,
+/* pos 190: state 79 */
+   0xEF /* 'o' */, 0x01 /* to pos 192 state 80 */,
+/* pos 192: state 80 */
+   0xEE /* 'n' */, 0x01 /* to pos 194 state 81 */,
+/* pos 194: state 81 */
+   0xBA /* ':' */, 0x01 /* to pos 196 state 82 */,
+/* pos 196: state 82 */
+   0x8B, 0x00 /* terminal marker */, 
+/* pos 198: state 83 */
+   0xF2 /* 'r' */, 0x01 /* to pos 200 state 84 */,
+/* pos 200: state 84 */
+   0xE9 /* 'i' */, 0x01 /* to pos 202 state 85 */,
+/* pos 202: state 85 */
+   0xE7 /* 'g' */, 0x01 /* to pos 204 state 86 */,
+/* pos 204: state 86 */
+   0xE9 /* 'i' */, 0x01 /* to pos 206 state 87 */,
+/* pos 206: state 87 */
+   0xEE /* 'n' */, 0x01 /* to pos 208 state 88 */,
+/* pos 208: state 88 */
+   0xBA /* ':' */, 0x01 /* to pos 210 state 89 */,
+/* pos 210: state 89 */
+   0x8C, 0x00 /* terminal marker */, 
+/* pos 212: state 90 */
+   0xF8 /* 'x' */, 0x01 /* to pos 214 state 91 */,
+/* pos 214: state 91 */
+   0xF4 /* 't' */, 0x01 /* to pos 216 state 92 */,
+/* pos 216: state 92 */
+   0xE5 /* 'e' */, 0x01 /* to pos 218 state 93 */,
+/* pos 218: state 93 */
+   0xEE /* 'n' */, 0x01 /* to pos 220 state 94 */,
+/* pos 220: state 94 */
+   0xF3 /* 's' */, 0x01 /* to pos 222 state 95 */,
+/* pos 222: state 95 */
+   0xE9 /* 'i' */, 0x01 /* to pos 224 state 96 */,
+/* pos 224: state 96 */
+   0xEF /* 'o' */, 0x01 /* to pos 226 state 97 */,
+/* pos 226: state 97 */
+   0xEE /* 'n' */, 0x01 /* to pos 228 state 98 */,
+/* pos 228: state 98 */
+   0xF3 /* 's' */, 0x01 /* to pos 230 state 99 */,
+/* pos 230: state 99 */
+   0xBA /* ':' */, 0x01 /* to pos 232 state 100 */,
+/* pos 232: state 100 */
+   0x8D, 0x00 /* terminal marker */, 
+/* pos 234: state 101 */
+   0xE3 /* 'c' */, 0x01 /* to pos 236 state 102 */,
+/* pos 236: state 102 */
+   0xE3 /* 'c' */, 0x01 /* to pos 238 state 103 */,
+/* pos 238: state 103 */
+   0xE5 /* 'e' */, 0x01 /* to pos 240 state 104 */,
+/* pos 240: state 104 */
+   0xF0 /* 'p' */, 0x01 /* to pos 242 state 105 */,
+/* pos 242: state 105 */
+   0xF4 /* 't' */, 0x01 /* to pos 244 state 106 */,
+/* pos 244: state 106 */
+   0xBA /* ':' */, 0x01 /* to pos 246 state 107 */,
+/* pos 246: state 107 */
+   0x8E, 0x00 /* terminal marker */, 
+/* pos 248: state 108 */
+   0xEF /* 'o' */, 0x01 /* to pos 250 state 109 */,
+/* pos 250: state 109 */
+   0xEE /* 'n' */, 0x01 /* to pos 252 state 110 */,
+/* pos 252: state 110 */
+   0xE3 /* 'c' */, 0x01 /* to pos 254 state 111 */,
+/* pos 254: state 111 */
+   0xE5 /* 'e' */, 0x01 /* to pos 256 state 112 */,
+/* pos 256: state 112 */
+   0xBA /* ':' */, 0x01 /* to pos 258 state 113 */,
+/* pos 258: state 113 */
+   0x8F, 0x00 /* terminal marker */, 
+/* pos 260: state 114 */
+   0xD4 /* 'T' */, 0x01 /* to pos 262 state 115 */,
+/* pos 262: state 115 */
+   0xD0 /* 'P' */, 0x01 /* to pos 264 state 116 */,
+/* pos 264: state 116 */
+   0xAF /* '/' */, 0x01 /* to pos 266 state 117 */,
+/* pos 266: state 117 */
+   0xB1 /* '1' */, 0x01 /* to pos 268 state 118 */,
+/* pos 268: state 118 */
+   0xAE /* '.' */, 0x01 /* to pos 270 state 119 */,
+/* pos 270: state 119 */
+   0xB1 /* '1' */, 0x01 /* to pos 272 state 120 */,
+/* pos 272: state 120 */
+   0xA0 /* ' ' */, 0x01 /* to pos 274 state 121 */,
+/* pos 274: state 121 */
+   0x90, 0x00 /* terminal marker */, 
+/* total size 276 bytes */
+
+
+};
+
+#define PARALLEL 30
+
+struct state {
+       char c[PARALLEL];
+       int state[PARALLEL];
+       int count;
+       int bytepos;
+};
+
+struct state state[1000];
+int next = 1;
+
+int lextable_decode(int pos, char c)
+{
+       while (1) {
+               if (lextable[pos + 1] == 0) // terminal marker
+                       return pos;
+
+               if ((lextable[pos] & 0x7f) == c)
+                       return pos + (lextable[pos + 1] << 1);
+
+               if (lextable[pos] & 0x80)
+                       return -1;
+
+               pos += 2;
+       }
+       return pos;
+}
+
+
+int main(void)
+{
+       int n = 0;
+       int m = 0;
+       int prev;
+       char c;
+       int walk;
+       int saw;
+       int y;
+
+       while (n < sizeof(set) / sizeof(set[0])) {
+
+               m = 0;
+               walk = 0;
+               prev = 0;
+
+               while (set[n][m]) {
+
+                       saw = 0;
+                       for (y = 0; y < state[walk].count; y++)
+                               if (state[walk].c[y] == set[n][m]) { /* exists */
+                                       walk = state[walk].state[y]; /* go forward */
+                                       saw = 1;
+                                       break;
+                               }
+
+                       if (saw)
+                               goto again;
+
+                       /* something we didn't see before */
+
+                       state[walk].c[state[walk].count] = set[n][m];
+
+                       state[walk].state[state[walk].count] = next;
+                       state[walk].count++;
+
+//                     if (set[n][m + 1] == '\0') /* terminal */
+                               walk = next++;
+again:
+                       m++;
+               }
+
+               state[walk].c[0] = n;
+               state[walk].state[0] = 0; /* terminal marker */
+               state[walk].count = 1;
+
+               n++;
+
+       }
+
+       walk = 0;
+       for (n = 0; n < next; n++) {
+               state[n].bytepos = walk;
+               walk += (2 * state[n].count);
+       }
+#if 0
+       for (n = 0; n < next; n++) {
+               fprintf(stderr, "State %d\n", n);
+               for (m = 0; m < state[n].count; m++)
+                       fprintf(stderr, "'%c' -> %d\n", state[n].c[m], state[n].state[m]);
+               fprintf(stderr, "(stop)\n");
+       }
+#endif
+
+       walk = 0;
+       for (n = 0; n < next; n++) {
+               fprintf(stderr, "/* pos %d: state %d */\n", walk, n);
+               for (m = 0; m < state[n].count; m++) {
+                       y = state[n].c[m];
+                       saw = state[n].state[m];
+
+                       if (m == state[n].count - 1)
+                               y |= 0x80; /* last option */
+
+                       if (saw == 0) // c is a terminal then
+                               fprintf(stderr, "   0x%02X, 0x00 /* terminal marker */, \n", y);
+                       else { // c is a character and we need a byte delta
+                               if ((state[saw].bytepos - walk) / 2 > 0xff) {
+                                       fprintf(stderr, "Tried to jump > 510 bytes ahead\n");
+                                       return 1;
+                               }
+                               prev = y &0x7f;
+                               if (prev < 32 || prev > 126)
+                                       prev = '.';
+                               fprintf(stderr, "   0x%02X /* '%c' */, 0x%02X /* to pos %d state %d */,\n", y, prev, (state[saw].bytepos - walk) / 2, state[saw].bytepos, saw);
+                       }
+                       walk += 2;
+               }
+       }
+
+       fprintf(stderr, "/* total size %d bytes */\n", walk);
+
+       for (n = 0; n < sizeof(set) / sizeof(set[0]); n++) {
+               walk = 0;
+               m = 0;
+
+               fprintf(stderr, "Trying %s\n", set[n]);
+
+               while (set[n][m]) {
+                       walk = lextable_decode(walk, set[n][m]);
+                       if (walk < 0) {
+                               fprintf(stderr, "failed\n");
+                               break;
+                       }
+                       if (lextable[walk + 1] == 0) {
+                               fprintf(stderr, "decode: %d\n", lextable[walk] & 0x7f);
+                               break;
+                       }
+                       m++;
+               }
+       }
+
+       return 0;
+}
+
+
+
diff --git a/lib/output.c b/lib/output.c
new file mode 100644 (file)
index 0000000..2d8c369
--- /dev/null
@@ -0,0 +1,611 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "private-libwebsockets.h"
+
+#ifdef WIN32
+#include <io.h>
+#endif
+
+static int
+libwebsocket_0405_frame_mask_generate(struct libwebsocket *wsi)
+{
+       int n;
+
+       /* fetch the per-frame nonce */
+
+       n = libwebsockets_get_random(wsi->protocol->owning_server,
+                                          wsi->u.ws.frame_masking_nonce_04, 4);
+       if (n != 4) {
+               lwsl_parser("Unable to read from random device %s %d\n",
+                                                    SYSTEM_RANDOM_FILEPATH, n);
+               return 1;
+       }
+
+       /* start masking from first byte of masking key buffer */
+       wsi->u.ws.frame_mask_index = 0;
+
+       return 0;
+}
+
+#ifdef _DEBUG
+
+void lwsl_hexdump(void *vbuf, size_t len)
+{
+       int n;
+       int m;
+       int start;
+       unsigned char *buf = (unsigned char *)vbuf;
+       char line[80];
+       char *p;
+
+       lwsl_parser("\n");
+
+       for (n = 0; n < len;) {
+               start = n;
+               p = line;
+
+               p += sprintf(p, "%04X: ", start);
+
+               for (m = 0; m < 16 && n < len; m++)
+                       p += sprintf(p, "%02X ", buf[n++]);
+               while (m++ < 16)
+                       p += sprintf(p, "   ");
+
+               p += sprintf(p, "   ");
+
+               for (m = 0; m < 16 && (start + m) < len; m++) {
+                       if (buf[start + m] >= ' ' && buf[start + m] < 127)
+                               *p++ = buf[start + m];
+                       else
+                               *p++ = '.';
+               }
+               while (m++ < 16)
+                       *p++ = ' ';
+
+               *p++ = '\n';
+               *p = '\0';
+               lwsl_debug("%s", line);
+       }
+       lwsl_debug("\n");
+}
+
+#endif
+
+/*
+ * notice this returns number of bytes sent, or -1
+ */
+
+int lws_issue_raw(struct libwebsocket *wsi, unsigned char *buf, size_t len)
+{
+       struct libwebsocket_context *context = wsi->protocol->owning_server;
+       int n;
+#ifndef LWS_NO_EXTENSIONS
+       int m;
+
+       /*
+        * one of the extensions is carrying our data itself?  Like mux?
+        */
+
+       for (n = 0; n < wsi->count_active_extensions; n++) {
+               /*
+                * there can only be active extensions after handshake completed
+                * so we can rely on protocol being set already in here
+                */
+               m = wsi->active_extensions[n]->callback(
+                               wsi->protocol->owning_server,
+                               wsi->active_extensions[n], wsi,
+                               LWS_EXT_CALLBACK_PACKET_TX_DO_SEND,
+                                    wsi->active_extensions_user[n], &buf, len);
+               if (m < 0) {
+                       lwsl_ext("Extension reports fatal error\n");
+                       return -1;
+               }
+               if (m) /* handled */ {
+/*                     lwsl_ext("ext sent it\n"); */
+                       return m;
+               }
+       }
+#endif
+       if (!wsi->sock)
+               lwsl_warn("** error 0 sock but expected to send\n");
+
+       /*
+        * nope, send it on the socket directly
+        */
+
+#if 0
+       lwsl_debug("  TX: ");
+       lws_hexdump(buf, len);
+#endif
+
+       lws_latency_pre(context, wsi);
+#ifdef LWS_OPENSSL_SUPPORT
+       if (wsi->ssl) {
+               n = SSL_write(wsi->ssl, buf, len);
+               lws_latency(context, wsi, "SSL_write lws_issue_raw", n, n >= 0);
+               if (n < 0) {
+                       lwsl_debug("ERROR writing to socket\n");
+                       return -1;
+               }
+       } else {
+#endif
+               n = send(wsi->sock, buf, len, MSG_NOSIGNAL);
+               lws_latency(context, wsi, "send lws_issue_raw", n, n == len);
+               if (n < 0) {
+                       lwsl_debug("ERROR writing len %d to skt %d\n", len, n);
+                       return -1;
+               }
+#ifdef LWS_OPENSSL_SUPPORT
+       }
+#endif
+       return n;
+}
+
+#ifdef LWS_NO_EXTENSIONS
+int
+lws_issue_raw_ext_access(struct libwebsocket *wsi,
+                                                unsigned char *buf, size_t len)
+{
+       return lws_issue_raw(wsi, buf, len);
+}
+#else
+int
+lws_issue_raw_ext_access(struct libwebsocket *wsi,
+                                                unsigned char *buf, size_t len)
+{
+       int ret;
+       struct lws_tokens eff_buf;
+       int m;
+       int n;
+
+       eff_buf.token = (char *)buf;
+       eff_buf.token_len = len;
+
+       /*
+        * while we have original buf to spill ourselves, or extensions report
+        * more in their pipeline
+        */
+
+       ret = 1;
+       while (ret == 1) {
+
+               /* default to nobody has more to spill */
+
+               ret = 0;
+
+               /* show every extension the new incoming data */
+
+               for (n = 0; n < wsi->count_active_extensions; n++) {
+                       m = wsi->active_extensions[n]->callback(
+                                       wsi->protocol->owning_server,
+                                       wsi->active_extensions[n], wsi,
+                                       LWS_EXT_CALLBACK_PACKET_TX_PRESEND,
+                                  wsi->active_extensions_user[n], &eff_buf, 0);
+                       if (m < 0) {
+                               lwsl_ext("Extension: fatal error\n");
+                               return -1;
+                       }
+                       if (m)
+                               /*
+                                * at least one extension told us he has more
+                                * to spill, so we will go around again after
+                                */
+                               ret = 1;
+               }
+
+               /* assuming they left us something to send, send it */
+
+               if (eff_buf.token_len) {
+                       n = lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
+                                                           eff_buf.token_len);
+                       if (n < 0)
+                               return -1;
+                       /*
+                        * Keep amount spilled small to minimize chance of this
+                        */
+                       if (n != eff_buf.token_len) {
+                               lwsl_err("Unable to spill ext %d vs %s\n",
+                                                         eff_buf.token_len, n);
+                               return -1;
+                       }
+
+               }
+
+               lwsl_parser("written %d bytes to client\n", eff_buf.token_len);
+
+               /* no extension has more to spill */
+
+               if (!ret)
+                       break;
+
+               /* we used up what we had */
+
+               eff_buf.token = NULL;
+               eff_buf.token_len = 0;
+
+               /*
+                * Did that leave the pipe choked?
+                */
+
+               if (!lws_send_pipe_choked(wsi))
+                       /* no we could add more */
+                       continue;
+
+               lwsl_debug("choked\n");
+
+               /*
+                * Yes, he's choked.  Don't spill the rest now get a callback
+                * when he is ready to send and take care of it there
+                */
+               libwebsocket_callback_on_writable(
+                                            wsi->protocol->owning_server, wsi);
+               wsi->extension_data_pending = 1;
+               ret = 0;
+       }
+
+       return len;
+}
+#endif
+
+/**
+ * libwebsocket_write() - Apply protocol then write data to client
+ * @wsi:       Websocket instance (available from user callback)
+ * @buf:       The data to send.  For data being sent on a websocket
+ *             connection (ie, not default http), this buffer MUST have
+ *             LWS_SEND_BUFFER_PRE_PADDING bytes valid BEFORE the pointer
+ *             and an additional LWS_SEND_BUFFER_POST_PADDING bytes valid
+ *             in the buffer after (buf + len).  This is so the protocol
+ *             header and trailer data can be added in-situ.
+ * @len:       Count of the data bytes in the payload starting from buf
+ * @protocol:  Use LWS_WRITE_HTTP to reply to an http connection, and one
+ *             of LWS_WRITE_BINARY or LWS_WRITE_TEXT to send appropriate
+ *             data on a websockets connection.  Remember to allow the extra
+ *             bytes before and after buf if LWS_WRITE_BINARY or LWS_WRITE_TEXT
+ *             are used.
+ *
+ *     This function provides the way to issue data back to the client
+ *     for both http and websocket protocols.
+ *
+ *     In the case of sending using websocket protocol, be sure to allocate
+ *     valid storage before and after buf as explained above.  This scheme
+ *     allows maximum efficiency of sending data and protocol in a single
+ *     packet while not burdening the user code with any protocol knowledge.
+ *
+ *     Return may be -1 for a fatal error needing connection close, or a
+ *     positive number reflecting the amount of bytes actually sent.  This
+ *     can be less than the requested number of bytes due to OS memory
+ *     pressure at any given time.
+ */
+
+int libwebsocket_write(struct libwebsocket *wsi, unsigned char *buf,
+                         size_t len, enum libwebsocket_write_protocol protocol)
+{
+       int n;
+       int pre = 0;
+       int post = 0;
+       int masked7 = wsi->mode == LWS_CONNMODE_WS_CLIENT;
+       unsigned char *dropmask = NULL;
+       unsigned char is_masked_bit = 0;
+       size_t orig_len = len;
+#ifndef LWS_NO_EXTENSIONS
+       struct lws_tokens eff_buf;
+       int m;
+#endif
+
+       if (len == 0 && protocol != LWS_WRITE_CLOSE) {
+               lwsl_warn("zero length libwebsocket_write attempt\n");
+               return 0;
+       }
+
+       if (protocol == LWS_WRITE_HTTP)
+               goto send_raw;
+
+       /* websocket protocol, either binary or text */
+
+       if (wsi->state != WSI_STATE_ESTABLISHED)
+               return -1;
+
+#ifndef LWS_NO_EXTENSIONS
+       /* give a change to the extensions to modify payload */
+       eff_buf.token = (char *)buf;
+       eff_buf.token_len = len;
+
+       switch (protocol) {
+       case LWS_WRITE_PING:
+       case LWS_WRITE_PONG:
+       case LWS_WRITE_CLOSE:
+               break;
+       default:
+
+               for (n = 0; n < wsi->count_active_extensions; n++) {
+                       m = wsi->active_extensions[n]->callback(
+                               wsi->protocol->owning_server,
+                               wsi->active_extensions[n], wsi,
+                               LWS_EXT_CALLBACK_PAYLOAD_TX,
+                               wsi->active_extensions_user[n], &eff_buf, 0);
+                       if (m < 0)
+                               return -1;
+               }
+       }
+
+       buf = (unsigned char *)eff_buf.token;
+       len = eff_buf.token_len;
+#endif
+
+       switch (wsi->ietf_spec_revision) {
+       case 13:
+               if (masked7) {
+                       pre += 4;
+                       dropmask = &buf[0 - pre];
+                       is_masked_bit = 0x80;
+               }
+
+               switch (protocol & 0xf) {
+               case LWS_WRITE_TEXT:
+                       n = LWS_WS_OPCODE_07__TEXT_FRAME;
+                       break;
+               case LWS_WRITE_BINARY:
+                       n = LWS_WS_OPCODE_07__BINARY_FRAME;
+                       break;
+               case LWS_WRITE_CONTINUATION:
+                       n = LWS_WS_OPCODE_07__CONTINUATION;
+                       break;
+
+               case LWS_WRITE_CLOSE:
+                       n = LWS_WS_OPCODE_07__CLOSE;
+
+                       /*
+                        * 06+ has a 2-byte status code in network order
+                        * we can do this because we demand post-buf
+                        */
+
+                       if (wsi->u.ws.close_reason) {
+                               /* reason codes count as data bytes */
+                               buf -= 2;
+                               buf[0] = wsi->u.ws.close_reason >> 8;
+                               buf[1] = wsi->u.ws.close_reason;
+                               len += 2;
+                       }
+                       break;
+               case LWS_WRITE_PING:
+                       n = LWS_WS_OPCODE_07__PING;
+                       break;
+               case LWS_WRITE_PONG:
+                       n = LWS_WS_OPCODE_07__PONG;
+                       break;
+               default:
+                       lwsl_warn("lws_write: unknown write opc / protocol\n");
+                       return -1;
+               }
+
+               if (!(protocol & LWS_WRITE_NO_FIN))
+                       n |= 1 << 7;
+
+               if (len < 126) {
+                       pre += 2;
+                       buf[-pre] = n;
+                       buf[-pre + 1] = len | is_masked_bit;
+               } else {
+                       if (len < 65536) {
+                               pre += 4;
+                               buf[-pre] = n;
+                               buf[-pre + 1] = 126 | is_masked_bit;
+                               buf[-pre + 2] = len >> 8;
+                               buf[-pre + 3] = len;
+                       } else {
+                               pre += 10;
+                               buf[-pre] = n;
+                               buf[-pre + 1] = 127 | is_masked_bit;
+#if defined __LP64__
+                                       buf[-pre + 2] = (len >> 56) & 0x7f;
+                                       buf[-pre + 3] = len >> 48;
+                                       buf[-pre + 4] = len >> 40;
+                                       buf[-pre + 5] = len >> 32;
+#else
+                                       buf[-pre + 2] = 0;
+                                       buf[-pre + 3] = 0;
+                                       buf[-pre + 4] = 0;
+                                       buf[-pre + 5] = 0;
+#endif
+                               buf[-pre + 6] = len >> 24;
+                               buf[-pre + 7] = len >> 16;
+                               buf[-pre + 8] = len >> 8;
+                               buf[-pre + 9] = len;
+                       }
+               }
+               break;
+       }
+
+       /*
+        * Deal with masking if we are in client -> server direction and
+        * the protocol demands it
+        */
+
+       if (wsi->mode == LWS_CONNMODE_WS_CLIENT) {
+
+               if (libwebsocket_0405_frame_mask_generate(wsi)) {
+                       lwsl_err("lws_write: frame mask generation failed\n");
+                       return -1;
+               }
+
+               /*
+                * in v7, just mask the payload
+                */
+               for (n = 4; n < (int)len + 4; n++)
+                       dropmask[n] = dropmask[n] ^
+                               wsi->u.ws.frame_masking_nonce_04[
+                                       (wsi->u.ws.frame_mask_index++) & 3];
+
+               if (dropmask)
+                       /* copy the frame nonce into place */
+                       memcpy(dropmask,
+                                      wsi->u.ws.frame_masking_nonce_04, 4);
+       }
+
+send_raw:
+
+#if 0
+       lwsl_debug("send %ld: ", len + post);
+       lwsl_hexdump(&buf[-pre], len + post);
+#endif
+
+       switch (protocol) {
+       case LWS_WRITE_CLOSE:
+/*             lwsl_hexdump(&buf[-pre], len + post); */
+       case LWS_WRITE_HTTP:
+       case LWS_WRITE_PONG:
+       case LWS_WRITE_PING:
+               return lws_issue_raw(wsi, (unsigned char *)buf - pre,
+                                                             len + pre + post);
+       default:
+               break;
+       }
+
+       /*
+        * give any active extensions a chance to munge the buffer
+        * before send.  We pass in a pointer to an lws_tokens struct
+        * prepared with the default buffer and content length that's in
+        * there.  Rather than rewrite the default buffer, extensions
+        * that expect to grow the buffer can adapt .token to
+        * point to their own per-connection buffer in the extension
+        * user allocation.  By default with no extensions or no
+        * extension callback handling, just the normal input buffer is
+        * used then so it is efficient.
+        *
+        * callback returns 1 in case it wants to spill more buffers
+        */
+
+       n = lws_issue_raw_ext_access(wsi, buf - pre, len + pre + post);
+       if (n < 0)
+               return n;
+
+       return orig_len - ((len - pre + post) -n );
+}
+
+int libwebsockets_serve_http_file_fragment(
+               struct libwebsocket_context *context, struct libwebsocket *wsi)
+{
+       int ret = 0;
+       int n, m;
+
+       while (!lws_send_pipe_choked(wsi)) {
+               n = read(wsi->u.http.fd, context->service_buffer,
+                                              sizeof(context->service_buffer));
+               if (n > 0) {
+                       m = libwebsocket_write(wsi, context->service_buffer, n,
+                                                               LWS_WRITE_HTTP);
+                       if (m < 0)
+                               return -1;
+
+                       wsi->u.http.filepos += n;
+                       if (m != n)
+                               /* adjust for what was not sent */
+                               lseek(wsi->u.http.fd, m - n, SEEK_CUR);
+               }
+
+               if (n < 0)
+                       return -1; /* caller will close */
+
+               if (n < sizeof(context->service_buffer) ||
+                               wsi->u.http.filepos == wsi->u.http.filelen) {
+                       wsi->state = WSI_STATE_HTTP;
+
+                       if (wsi->protocol->callback)
+                               ret = user_callback_handle_rxflow(
+                                       wsi->protocol->callback, context, wsi,
+                                       LWS_CALLBACK_HTTP_FILE_COMPLETION,
+                                       wsi->user_space, NULL, 0);
+                       return ret;
+               }
+       }
+
+       lwsl_notice("choked before able to send whole file (post)\n");
+       libwebsocket_callback_on_writable(context, wsi);
+
+       return ret;
+}
+
+/**
+ * libwebsockets_serve_http_file() - Send a file back to the client using http
+ * @context:           libwebsockets context
+ * @wsi:               Websocket instance (available from user callback)
+ * @file:              The file to issue over http
+ * @content_type:      The http content type, eg, text/html
+ *
+ *     This function is intended to be called from the callback in response
+ *     to http requests from the client.  It allows the callback to issue
+ *     local files down the http link in a single step.
+ *
+ *     Returning <0 indicates error and the wsi should be closed.  Returning
+ *     >0 indicates the file was completely sent and the wsi should be closed.
+ *     ==0 indicates the file transfer is started and needs more service later,
+ *     the wsi should be left alone.
+ */
+
+int libwebsockets_serve_http_file(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi, const char *file,
+                                                      const char *content_type)
+{
+       struct stat stat_buf;
+       unsigned char *p = context->service_buffer;
+       int ret = 0;
+
+       wsi->u.http.fd = open(file, O_RDONLY
+#ifdef WIN32
+                        | _O_BINARY
+#endif
+       );
+
+       if (wsi->u.http.fd < 1) {
+               p += sprintf((char *)p,
+                "HTTP/1.0 400 Bad\x0d\x0aServer: libwebsockets\x0d\x0a\x0d\x0a"
+               );
+               wsi->u.http.fd = 0;
+               /* too small to care about partial, closing anyway */
+               libwebsocket_write(wsi, context->service_buffer,
+                               p - context->service_buffer, LWS_WRITE_HTTP);
+
+               return -1;
+       }
+
+       fstat(wsi->u.http.fd, &stat_buf);
+       wsi->u.http.filelen = stat_buf.st_size;
+       p += sprintf((char *)p,
+"HTTP/1.0 200 OK\x0d\x0aServer: libwebsockets\x0d\x0a""Content-Type: %s\x0d\x0a",
+                                                                 content_type);
+       p += sprintf((char *)p,
+               "Content-Length: %u\x0d\x0a\x0d\x0a",
+                                       (unsigned int)stat_buf.st_size);
+
+       ret = libwebsocket_write(wsi, context->service_buffer,
+                                  p - context->service_buffer, LWS_WRITE_HTTP);
+       if (ret != (p - context->service_buffer)) {
+               lwsl_err("_write returned %d from %d\n", ret, (p - context->service_buffer));
+               return -1;
+       }
+
+       wsi->u.http.filepos = 0;
+       wsi->state = WSI_STATE_HTTP_ISSUING_FILE;
+
+       return libwebsockets_serve_http_file_fragment(context, wsi);
+}
+
diff --git a/lib/parsers.c b/lib/parsers.c
new file mode 100644 (file)
index 0000000..4de8048
--- /dev/null
@@ -0,0 +1,1134 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "private-libwebsockets.h"
+
+#ifdef WIN32
+#include <io.h>
+#endif
+
+
+unsigned char lextable[] = {
+       /* pos 0: state 0 */
+       0x47 /* 'G' */, 0x07 /* to pos 14 state 1 */,
+       0x48 /* 'H' */, 0x0A /* to pos 22 state 5 */,
+       0x43 /* 'C' */, 0x0F /* to pos 34 state 10 */,
+       0x53 /* 'S' */, 0x19 /* to pos 56 state 21 */,
+       0x55 /* 'U' */, 0x3F /* to pos 134 state 51 */,
+       0x4F /* 'O' */, 0x46 /* to pos 150 state 59 */,
+       0x8D /* '.' */, 0x52 /* to pos 176 state 72 */,
+       /* pos 14: state 1 */
+       0xC5 /* 'E' */, 0x01 /* to pos 16 state 2 */,
+       /* pos 16: state 2 */
+       0xD4 /* 'T' */, 0x01 /* to pos 18 state 3 */,
+       /* pos 18: state 3 */
+       0xA0 /* ' ' */, 0x01 /* to pos 20 state 4 */,
+       /* pos 20: state 4 */
+       0x80, 0x00 /* terminal marker */,
+       /* pos 22: state 5 */
+       0x6F /* 'o' */, 0x02 /* to pos 26 state 6 */,
+       0xD4 /* 'T' */, 0x76 /* to pos 260 state 114 */,
+       /* pos 26: state 6 */
+       0xF3 /* 's' */, 0x01 /* to pos 28 state 7 */,
+       /* pos 28: state 7 */
+       0xF4 /* 't' */, 0x01 /* to pos 30 state 8 */,
+       /* pos 30: state 8 */
+       0xBA /* ':' */, 0x01 /* to pos 32 state 9 */,
+       /* pos 32: state 9 */
+       0x81, 0x00 /* terminal marker */,
+       /* pos 34: state 10 */
+       0xEF /* 'o' */, 0x01 /* to pos 36 state 11 */,
+       /* pos 36: state 11 */
+       0xEE /* 'n' */, 0x01 /* to pos 38 state 12 */,
+       /* pos 38: state 12 */
+       0xEE /* 'n' */, 0x01 /* to pos 40 state 13 */,
+       /* pos 40: state 13 */
+       0xE5 /* 'e' */, 0x01 /* to pos 42 state 14 */,
+       /* pos 42: state 14 */
+       0xE3 /* 'c' */, 0x01 /* to pos 44 state 15 */,
+       /* pos 44: state 15 */
+       0xF4 /* 't' */, 0x01 /* to pos 46 state 16 */,
+       /* pos 46: state 16 */
+       0xE9 /* 'i' */, 0x01 /* to pos 48 state 17 */,
+       /* pos 48: state 17 */
+       0xEF /* 'o' */, 0x01 /* to pos 50 state 18 */,
+       /* pos 50: state 18 */
+       0xEE /* 'n' */, 0x01 /* to pos 52 state 19 */,
+       /* pos 52: state 19 */
+       0xBA /* ':' */, 0x01 /* to pos 54 state 20 */,
+       /* pos 54: state 20 */
+       0x82, 0x00 /* terminal marker */,
+       /* pos 56: state 21 */
+       0xE5 /* 'e' */, 0x01 /* to pos 58 state 22 */,
+       /* pos 58: state 22 */
+       0xE3 /* 'c' */, 0x01 /* to pos 60 state 23 */,
+       /* pos 60: state 23 */
+       0xAD /* '-' */, 0x01 /* to pos 62 state 24 */,
+       /* pos 62: state 24 */
+       0xD7 /* 'W' */, 0x01 /* to pos 64 state 25 */,
+       /* pos 64: state 25 */
+       0xE5 /* 'e' */, 0x01 /* to pos 66 state 26 */,
+       /* pos 66: state 26 */
+       0xE2 /* 'b' */, 0x01 /* to pos 68 state 27 */,
+       /* pos 68: state 27 */
+       0xD3 /* 'S' */, 0x01 /* to pos 70 state 28 */,
+       /* pos 70: state 28 */
+       0xEF /* 'o' */, 0x01 /* to pos 72 state 29 */,
+       /* pos 72: state 29 */
+       0xE3 /* 'c' */, 0x01 /* to pos 74 state 30 */,
+       /* pos 74: state 30 */
+       0xEB /* 'k' */, 0x01 /* to pos 76 state 31 */,
+       /* pos 76: state 31 */
+       0xE5 /* 'e' */, 0x01 /* to pos 78 state 32 */,
+       /* pos 78: state 32 */
+       0xF4 /* 't' */, 0x01 /* to pos 80 state 33 */,
+       /* pos 80: state 33 */
+       0xAD /* '-' */, 0x01 /* to pos 82 state 34 */,
+       /* pos 82: state 34 */
+       0x4B /* 'K' */, 0x08 /* to pos 98 state 35 */,
+       0x50 /* 'P' */, 0x10 /* to pos 116 state 42 */,
+       0x44 /* 'D' */, 0x27 /* to pos 164 state 66 */,
+       0x56 /* 'V' */, 0x2F /* to pos 182 state 75 */,
+       0x4F /* 'O' */, 0x36 /* to pos 198 state 83 */,
+       0x45 /* 'E' */, 0x3C /* to pos 212 state 90 */,
+       0x41 /* 'A' */, 0x46 /* to pos 234 state 101 */,
+       0xCE /* 'N' */, 0x4C /* to pos 248 state 108 */,
+       /* pos 98: state 35 */
+       0xE5 /* 'e' */, 0x01 /* to pos 100 state 36 */,
+       /* pos 100: state 36 */
+       0xF9 /* 'y' */, 0x01 /* to pos 102 state 37 */,
+       /* pos 102: state 37 */
+       0x31 /* '1' */, 0x03 /* to pos 108 state 38 */,
+       0x32 /* '2' */, 0x04 /* to pos 112 state 40 */,
+       0xBA /* ':' */, 0x25 /* to pos 180 state 74 */,
+       /* pos 108: state 38 */
+       0xBA /* ':' */, 0x01 /* to pos 110 state 39 */,
+       /* pos 110: state 39 */
+       0x83, 0x00 /* terminal marker */,
+       /* pos 112: state 40 */
+       0xBA /* ':' */, 0x01 /* to pos 114 state 41 */,
+       /* pos 114: state 41 */
+       0x84, 0x00 /* terminal marker */,
+       /* pos 116: state 42 */
+       0xF2 /* 'r' */, 0x01 /* to pos 118 state 43 */,
+       /* pos 118: state 43 */
+       0xEF /* 'o' */, 0x01 /* to pos 120 state 44 */,
+       /* pos 120: state 44 */
+       0xF4 /* 't' */, 0x01 /* to pos 122 state 45 */,
+       /* pos 122: state 45 */
+       0xEF /* 'o' */, 0x01 /* to pos 124 state 46 */,
+       /* pos 124: state 46 */
+       0xE3 /* 'c' */, 0x01 /* to pos 126 state 47 */,
+       /* pos 126: state 47 */
+       0xEF /* 'o' */, 0x01 /* to pos 128 state 48 */,
+       /* pos 128: state 48 */
+       0xEC /* 'l' */, 0x01 /* to pos 130 state 49 */,
+       /* pos 130: state 49 */
+       0xBA /* ':' */, 0x01 /* to pos 132 state 50 */,
+       /* pos 132: state 50 */
+       0x85, 0x00 /* terminal marker */,
+       /* pos 134: state 51 */
+       0xF0 /* 'p' */, 0x01 /* to pos 136 state 52 */,
+       /* pos 136: state 52 */
+       0xE7 /* 'g' */, 0x01 /* to pos 138 state 53 */,
+       /* pos 138: state 53 */
+       0xF2 /* 'r' */, 0x01 /* to pos 140 state 54 */,
+       /* pos 140: state 54 */
+       0xE1 /* 'a' */, 0x01 /* to pos 142 state 55 */,
+       /* pos 142: state 55 */
+       0xE4 /* 'd' */, 0x01 /* to pos 144 state 56 */,
+       /* pos 144: state 56 */
+       0xE5 /* 'e' */, 0x01 /* to pos 146 state 57 */,
+       /* pos 146: state 57 */
+       0xBA /* ':' */, 0x01 /* to pos 148 state 58 */,
+       /* pos 148: state 58 */
+       0x86, 0x00 /* terminal marker */,
+       /* pos 150: state 59 */
+       0xF2 /* 'r' */, 0x01 /* to pos 152 state 60 */,
+       /* pos 152: state 60 */
+       0xE9 /* 'i' */, 0x01 /* to pos 154 state 61 */,
+       /* pos 154: state 61 */
+       0xE7 /* 'g' */, 0x01 /* to pos 156 state 62 */,
+       /* pos 156: state 62 */
+       0xE9 /* 'i' */, 0x01 /* to pos 158 state 63 */,
+       /* pos 158: state 63 */
+       0xEE /* 'n' */, 0x01 /* to pos 160 state 64 */,
+       /* pos 160: state 64 */
+       0xBA /* ':' */, 0x01 /* to pos 162 state 65 */,
+       /* pos 162: state 65 */
+       0x87, 0x00 /* terminal marker */,
+       /* pos 164: state 66 */
+       0xF2 /* 'r' */, 0x01 /* to pos 166 state 67 */,
+       /* pos 166: state 67 */
+       0xE1 /* 'a' */, 0x01 /* to pos 168 state 68 */,
+       /* pos 168: state 68 */
+       0xE6 /* 'f' */, 0x01 /* to pos 170 state 69 */,
+       /* pos 170: state 69 */
+       0xF4 /* 't' */, 0x01 /* to pos 172 state 70 */,
+       /* pos 172: state 70 */
+       0xBA /* ':' */, 0x01 /* to pos 174 state 71 */,
+       /* pos 174: state 71 */
+       0x88, 0x00 /* terminal marker */,
+       /* pos 176: state 72 */
+       0x8A /* '.' */, 0x01 /* to pos 178 state 73 */,
+       /* pos 178: state 73 */
+       0x89, 0x00 /* terminal marker */,
+       /* pos 180: state 74 */
+       0x8A, 0x00 /* terminal marker */,
+       /* pos 182: state 75 */
+       0xE5 /* 'e' */, 0x01 /* to pos 184 state 76 */,
+       /* pos 184: state 76 */
+       0xF2 /* 'r' */, 0x01 /* to pos 186 state 77 */,
+       /* pos 186: state 77 */
+       0xF3 /* 's' */, 0x01 /* to pos 188 state 78 */,
+       /* pos 188: state 78 */
+       0xE9 /* 'i' */, 0x01 /* to pos 190 state 79 */,
+       /* pos 190: state 79 */
+       0xEF /* 'o' */, 0x01 /* to pos 192 state 80 */,
+       /* pos 192: state 80 */
+       0xEE /* 'n' */, 0x01 /* to pos 194 state 81 */,
+       /* pos 194: state 81 */
+       0xBA /* ':' */, 0x01 /* to pos 196 state 82 */,
+       /* pos 196: state 82 */
+       0x8B, 0x00 /* terminal marker */,
+       /* pos 198: state 83 */
+       0xF2 /* 'r' */, 0x01 /* to pos 200 state 84 */,
+       /* pos 200: state 84 */
+       0xE9 /* 'i' */, 0x01 /* to pos 202 state 85 */,
+       /* pos 202: state 85 */
+       0xE7 /* 'g' */, 0x01 /* to pos 204 state 86 */,
+       /* pos 204: state 86 */
+       0xE9 /* 'i' */, 0x01 /* to pos 206 state 87 */,
+       /* pos 206: state 87 */
+       0xEE /* 'n' */, 0x01 /* to pos 208 state 88 */,
+       /* pos 208: state 88 */
+       0xBA /* ':' */, 0x01 /* to pos 210 state 89 */,
+       /* pos 210: state 89 */
+       0x8C, 0x00 /* terminal marker */,
+       /* pos 212: state 90 */
+       0xF8 /* 'x' */, 0x01 /* to pos 214 state 91 */,
+       /* pos 214: state 91 */
+       0xF4 /* 't' */, 0x01 /* to pos 216 state 92 */,
+       /* pos 216: state 92 */
+       0xE5 /* 'e' */, 0x01 /* to pos 218 state 93 */,
+       /* pos 218: state 93 */
+       0xEE /* 'n' */, 0x01 /* to pos 220 state 94 */,
+       /* pos 220: state 94 */
+       0xF3 /* 's' */, 0x01 /* to pos 222 state 95 */,
+       /* pos 222: state 95 */
+       0xE9 /* 'i' */, 0x01 /* to pos 224 state 96 */,
+       /* pos 224: state 96 */
+       0xEF /* 'o' */, 0x01 /* to pos 226 state 97 */,
+       /* pos 226: state 97 */
+       0xEE /* 'n' */, 0x01 /* to pos 228 state 98 */,
+       /* pos 228: state 98 */
+       0xF3 /* 's' */, 0x01 /* to pos 230 state 99 */,
+       /* pos 230: state 99 */
+       0xBA /* ':' */, 0x01 /* to pos 232 state 100 */,
+       /* pos 232: state 100 */
+       0x8D, 0x00 /* terminal marker */,
+       /* pos 234: state 101 */
+       0xE3 /* 'c' */, 0x01 /* to pos 236 state 102 */,
+       /* pos 236: state 102 */
+       0xE3 /* 'c' */, 0x01 /* to pos 238 state 103 */,
+       /* pos 238: state 103 */
+       0xE5 /* 'e' */, 0x01 /* to pos 240 state 104 */,
+       /* pos 240: state 104 */
+       0xF0 /* 'p' */, 0x01 /* to pos 242 state 105 */,
+       /* pos 242: state 105 */
+       0xF4 /* 't' */, 0x01 /* to pos 244 state 106 */,
+       /* pos 244: state 106 */
+       0xBA /* ':' */, 0x01 /* to pos 246 state 107 */,
+       /* pos 246: state 107 */
+       0x8E, 0x00 /* terminal marker */,
+       /* pos 248: state 108 */
+       0xEF /* 'o' */, 0x01 /* to pos 250 state 109 */,
+       /* pos 250: state 109 */
+       0xEE /* 'n' */, 0x01 /* to pos 252 state 110 */,
+       /* pos 252: state 110 */
+       0xE3 /* 'c' */, 0x01 /* to pos 254 state 111 */,
+       /* pos 254: state 111 */
+       0xE5 /* 'e' */, 0x01 /* to pos 256 state 112 */,
+       /* pos 256: state 112 */
+       0xBA /* ':' */, 0x01 /* to pos 258 state 113 */,
+       /* pos 258: state 113 */
+       0x8F, 0x00 /* terminal marker */,
+       /* pos 260: state 114 */
+       0xD4 /* 'T' */, 0x01 /* to pos 262 state 115 */,
+       /* pos 262: state 115 */
+       0xD0 /* 'P' */, 0x01 /* to pos 264 state 116 */,
+       /* pos 264: state 116 */
+       0xAF /* '/' */, 0x01 /* to pos 266 state 117 */,
+       /* pos 266: state 117 */
+       0xB1 /* '1' */, 0x01 /* to pos 268 state 118 */,
+       /* pos 268: state 118 */
+       0xAE /* '.' */, 0x01 /* to pos 270 state 119 */,
+       /* pos 270: state 119 */
+       0xB1 /* '1' */, 0x01 /* to pos 272 state 120 */,
+       /* pos 272: state 120 */
+       0xA0 /* ' ' */, 0x01 /* to pos 274 state 121 */,
+       /* pos 274: state 121 */
+       0x90, 0x00 /* terminal marker */,
+       /* total size 276 bytes */
+};
+
+int lextable_decode(int pos, char c)
+{
+       while (pos >= 0) {
+               if (lextable[pos + 1] == 0) /* terminal marker */
+                       return pos;
+
+               if ((lextable[pos] & 0x7f) == c)
+                       return pos + (lextable[pos + 1] << 1);
+
+               if (lextable[pos] & 0x80)
+                       return -1;
+
+               pos += 2;
+       }
+       return pos;
+}
+
+int lws_allocate_header_table(struct libwebsocket *wsi)
+{
+       wsi->u.hdr.ah = malloc(sizeof(*wsi->u.hdr.ah));
+       if (wsi->u.hdr.ah == NULL) {
+               lwsl_err("Out of memory\n");
+               return -1;
+       }
+       memset(wsi->u.hdr.ah->frag_index, 0, sizeof(wsi->u.hdr.ah->frag_index));
+       wsi->u.hdr.ah->next_frag_index = 0;
+       wsi->u.hdr.ah->pos = 0;
+
+       return 0;
+}
+
+int lws_hdr_total_length(struct libwebsocket *wsi, enum lws_token_indexes h)
+{
+       int n;
+       int len = 0;
+
+       n = wsi->u.hdr.ah->frag_index[h];
+       if (n == 0)
+               return 0;
+
+       do {
+               len += wsi->u.hdr.ah->frags[n].len;
+               n = wsi->u.hdr.ah->frags[n].next_frag_index;
+       } while (n);
+
+       return len;
+}
+
+int lws_hdr_copy(struct libwebsocket *wsi, char *dest, int len,
+                                               enum lws_token_indexes h)
+{
+       int toklen = lws_hdr_total_length(wsi, h);
+       int n;
+
+       if (toklen >= len)
+               return -1;
+
+       n = wsi->u.hdr.ah->frag_index[h];
+       if (n == 0)
+               return 0;
+
+       do {
+               strcpy(dest,
+                       &wsi->u.hdr.ah->data[wsi->u.hdr.ah->frags[n].offset]);
+               dest += wsi->u.hdr.ah->frags[n].len;
+               n = wsi->u.hdr.ah->frags[n].next_frag_index;
+       } while (n);
+
+       return toklen;
+}
+
+char *lws_hdr_simple_ptr(struct libwebsocket *wsi, enum lws_token_indexes h)
+{
+       int n;
+
+       n = wsi->u.hdr.ah->frag_index[h];
+       if (!n)
+               return NULL;
+
+       return &wsi->u.hdr.ah->data[wsi->u.hdr.ah->frags[n].offset];
+}
+
+int lws_hdr_simple_create(struct libwebsocket *wsi,
+                               enum lws_token_indexes h, const char *s)
+{
+       wsi->u.hdr.ah->next_frag_index++;
+       if (wsi->u.hdr.ah->next_frag_index ==
+              sizeof(wsi->u.hdr.ah->frags) / sizeof(wsi->u.hdr.ah->frags[0])) {
+               lwsl_warn("More hdr frags than we can deal with, dropping\n");
+               return -1;
+       }
+
+       wsi->u.hdr.ah->frag_index[h] = wsi->u.hdr.ah->next_frag_index;
+
+       wsi->u.hdr.ah->frags[wsi->u.hdr.ah->next_frag_index].offset =
+                                                            wsi->u.hdr.ah->pos;
+       wsi->u.hdr.ah->frags[wsi->u.hdr.ah->next_frag_index].len = 0;
+       wsi->u.hdr.ah->frags[wsi->u.hdr.ah->next_frag_index].next_frag_index =
+                                                                             0;
+
+       do {
+               if (wsi->u.hdr.ah->pos == sizeof(wsi->u.hdr.ah->data)) {
+                       lwsl_err("Ran out of header data space\n");
+                       return -1;
+               }
+               wsi->u.hdr.ah->data[wsi->u.hdr.ah->pos++] = *s;
+               if (*s)
+                       wsi->u.hdr.ah->frags[
+                                       wsi->u.hdr.ah->next_frag_index].len++;
+       } while (*s++);
+
+       return 0;
+}
+
+int libwebsocket_parse(struct libwebsocket *wsi, unsigned char c)
+{
+       int n;
+
+       switch (wsi->u.hdr.parser_state) {
+       case WSI_TOKEN_GET_URI:
+       case WSI_TOKEN_HOST:
+       case WSI_TOKEN_CONNECTION:
+       case WSI_TOKEN_KEY1:
+       case WSI_TOKEN_KEY2:
+       case WSI_TOKEN_PROTOCOL:
+       case WSI_TOKEN_UPGRADE:
+       case WSI_TOKEN_ORIGIN:
+       case WSI_TOKEN_SWORIGIN:
+       case WSI_TOKEN_DRAFT:
+       case WSI_TOKEN_CHALLENGE:
+       case WSI_TOKEN_KEY:
+       case WSI_TOKEN_VERSION:
+       case WSI_TOKEN_ACCEPT:
+       case WSI_TOKEN_NONCE:
+       case WSI_TOKEN_EXTENSIONS:
+       case WSI_TOKEN_HTTP:
+
+               lwsl_parser("WSI_TOK_(%d) '%c'\n", wsi->u.hdr.parser_state, c);
+
+               /* collect into malloc'd buffers */
+               /* optional initial space swallow */
+               if (!wsi->u.hdr.ah->frags[wsi->u.hdr.ah->frag_index[
+                                     wsi->u.hdr.parser_state]].len && c == ' ')
+                       break;
+
+               /* special case space terminator for get-uri */
+               if (wsi->u.hdr.parser_state == WSI_TOKEN_GET_URI && c == ' ') {
+                       c = '\0';
+                       wsi->u.hdr.parser_state = WSI_TOKEN_SKIPPING;
+               }
+
+               /* bail at EOL */
+               if (wsi->u.hdr.parser_state != WSI_TOKEN_CHALLENGE &&
+                                                                 c == '\x0d') {
+                       c = '\0';
+                       wsi->u.hdr.parser_state = WSI_TOKEN_SKIPPING_SAW_CR;
+                       lwsl_parser("*\n");
+               }
+
+               if (wsi->u.hdr.ah->pos == sizeof(wsi->u.hdr.ah->data)) {
+                       lwsl_warn("excessive header content\n");
+                       return -1;
+               }
+               wsi->u.hdr.ah->data[wsi->u.hdr.ah->pos++] = c;
+               if (c)
+                       wsi->u.hdr.ah->frags[
+                                       wsi->u.hdr.ah->next_frag_index].len++;
+
+               /* per-protocol end of headers management */
+
+               if (wsi->u.hdr.parser_state == WSI_TOKEN_CHALLENGE)
+                       goto set_parsing_complete;
+               break;
+
+               /* collecting and checking a name part */
+       case WSI_TOKEN_NAME_PART:
+               lwsl_parser("WSI_TOKEN_NAME_PART '%c'\n", c);
+
+               wsi->u.hdr.lextable_pos =
+                               lextable_decode(wsi->u.hdr.lextable_pos, c);
+
+               if (wsi->u.hdr.lextable_pos < 0) {
+                       /* this is not a header we know about */
+                       if (wsi->u.hdr.ah->frag_index[WSI_TOKEN_GET_URI]) {
+                               /*
+                                * altready had the method, no idea what
+                                * this crap is, ignore
+                                */
+                               wsi->u.hdr.parser_state = WSI_TOKEN_SKIPPING;
+                               break;
+                       }
+                       /*
+                        * hm it's an unknown http method in fact,
+                        * treat as dangerous
+                        */
+
+                       lwsl_info("Unknown method - dropping\n");
+                       return -1;
+               }
+               if (lextable[wsi->u.hdr.lextable_pos + 1] == 0) {
+
+                       /* terminal state */
+
+                       n = lextable[wsi->u.hdr.lextable_pos] & 0x7f;
+
+                       lwsl_parser("known hdr %d\n", n);
+
+                       if (n == WSI_TOKEN_GET_URI &&
+                               wsi->u.hdr.ah->frag_index[WSI_TOKEN_GET_URI]) {
+                               lwsl_warn("Duplicated GET\n");
+                               return -1;
+                       }
+
+                       /*
+                        * WSORIGIN is protocol equiv to ORIGIN,
+                        * JWebSocket likes to send it, map to ORIGIN
+                        */
+                       if (n == WSI_TOKEN_SWORIGIN)
+                               n = WSI_TOKEN_ORIGIN;
+
+                       wsi->u.hdr.parser_state = (enum lws_token_indexes)
+                                                       (WSI_TOKEN_GET_URI + n);
+                       if (wsi->u.hdr.parser_state == WSI_TOKEN_CHALLENGE)
+                               goto set_parsing_complete;
+
+                       goto start_fragment;
+               }
+               break;
+
+start_fragment:
+               wsi->u.hdr.ah->next_frag_index++;
+               if (wsi->u.hdr.ah->next_frag_index ==
+                               sizeof(wsi->u.hdr.ah->frags) /
+                                             sizeof(wsi->u.hdr.ah->frags[0])) {
+                       lwsl_warn("More hdr frags than we can deal with\n");
+                       return -1;
+               }
+
+               wsi->u.hdr.ah->frags[wsi->u.hdr.ah->next_frag_index].offset =
+                                                            wsi->u.hdr.ah->pos;
+               wsi->u.hdr.ah->frags[wsi->u.hdr.ah->next_frag_index].len = 0;
+               wsi->u.hdr.ah->frags[
+                           wsi->u.hdr.ah->next_frag_index].next_frag_index = 0;
+
+               n = wsi->u.hdr.ah->frag_index[wsi->u.hdr.parser_state];
+               if (!n) { /* first fragment */
+                       wsi->u.hdr.ah->frag_index[wsi->u.hdr.parser_state] =
+                                                wsi->u.hdr.ah->next_frag_index;
+               } else { /* continuation */
+                       while (wsi->u.hdr.ah->frags[n].next_frag_index)
+                               n = wsi->u.hdr.ah->frags[n].next_frag_index;
+                       wsi->u.hdr.ah->frags[n].next_frag_index =
+                                                wsi->u.hdr.ah->next_frag_index;
+
+                       if (wsi->u.hdr.ah->pos == sizeof(wsi->u.hdr.ah->data)) {
+                               lwsl_warn("excessive header content\n");
+                               return -1;
+                       }
+
+                       wsi->u.hdr.ah->data[wsi->u.hdr.ah->pos++] = ' ';
+                       wsi->u.hdr.ah->frags[
+                                         wsi->u.hdr.ah->next_frag_index].len++;
+               }
+
+               break;
+
+
+               /* skipping arg part of a name we didn't recognize */
+       case WSI_TOKEN_SKIPPING:
+               lwsl_parser("WSI_TOKEN_SKIPPING '%c'\n", c);
+               if (c == '\x0d')
+                       wsi->u.hdr.parser_state = WSI_TOKEN_SKIPPING_SAW_CR;
+               break;
+
+       case WSI_TOKEN_SKIPPING_SAW_CR:
+               lwsl_parser("WSI_TOKEN_SKIPPING_SAW_CR '%c'\n", c);
+               if (c == '\x0a') {
+                       wsi->u.hdr.parser_state = WSI_TOKEN_NAME_PART;
+                       wsi->u.hdr.lextable_pos = 0;
+               } else
+                       wsi->u.hdr.parser_state = WSI_TOKEN_SKIPPING;
+               break;
+               /* we're done, ignore anything else */
+       case WSI_PARSING_COMPLETE:
+               lwsl_parser("WSI_PARSING_COMPLETE '%c'\n", c);
+               break;
+
+       default:        /* keep gcc happy */
+               break;
+       }
+
+       return 0;
+
+set_parsing_complete:
+
+       if (lws_hdr_total_length(wsi, WSI_TOKEN_UPGRADE)) {
+               if (lws_hdr_total_length(wsi, WSI_TOKEN_VERSION))
+                       wsi->ietf_spec_revision =
+                              atoi(lws_hdr_simple_ptr(wsi, WSI_TOKEN_VERSION));
+
+               lwsl_parser("v%02d hdrs completed\n", wsi->ietf_spec_revision);
+       }
+       wsi->u.hdr.parser_state = WSI_PARSING_COMPLETE;
+       wsi->hdr_parsing_completed = 1;
+
+       return 0;
+}
+
+
+/**
+ * lws_frame_is_binary: true if the current frame was sent in binary mode
+ *
+ * @wsi: the connection we are inquiring about
+ *
+ * This is intended to be called from the LWS_CALLBACK_RECEIVE callback if
+ * it's interested to see if the frame it's dealing with was sent in binary
+ * mode.
+ */
+
+int lws_frame_is_binary(struct libwebsocket *wsi)
+{
+       return wsi->u.ws.frame_is_binary;
+}
+
+int
+libwebsocket_rx_sm(struct libwebsocket *wsi, unsigned char c)
+{
+       int n;
+       struct lws_tokens eff_buf;
+       int ret = 0;
+#ifndef LWS_NO_EXTENSIONS
+       int handled;
+       int m;
+#endif
+
+#if 0
+       lwsl_debug("RX: %02X ", c);
+#endif
+
+       switch (wsi->lws_rx_parse_state) {
+       case LWS_RXPS_NEW:
+
+               switch (wsi->ietf_spec_revision) {
+               case 13:
+                       /*
+                        * no prepended frame key any more
+                        */
+                       wsi->u.ws.all_zero_nonce = 1;
+                       goto handle_first;
+
+               default:
+                       lwsl_warn("lws_rx_sm: unknown spec version %d\n",
+                                                      wsi->ietf_spec_revision);
+                       break;
+               }
+               break;
+       case LWS_RXPS_04_MASK_NONCE_1:
+               wsi->u.ws.frame_masking_nonce_04[1] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_MASK_NONCE_2;
+               break;
+       case LWS_RXPS_04_MASK_NONCE_2:
+               wsi->u.ws.frame_masking_nonce_04[2] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_MASK_NONCE_3;
+               break;
+       case LWS_RXPS_04_MASK_NONCE_3:
+               wsi->u.ws.frame_masking_nonce_04[3] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+
+               /*
+                * start from the zero'th byte in the XOR key buffer since
+                * this is the start of a frame with a new key
+                */
+
+               wsi->u.ws.frame_mask_index = 0;
+
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_1;
+               break;
+
+       /*
+        *  04 logical framing from the spec (all this is masked when incoming
+        *  and has to be unmasked)
+        *
+        * We ignore the possibility of extension data because we don't
+        * negotiate any extensions at the moment.
+        *
+        *    0                   1                   2                   3
+        *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+        *   +-+-+-+-+-------+-+-------------+-------------------------------+
+        *   |F|R|R|R| opcode|R| Payload len |    Extended payload length    |
+        *   |I|S|S|S|  (4)  |S|     (7)     |             (16/63)           |
+        *   |N|V|V|V|       |V|             |   (if payload len==126/127)   |
+        *   | |1|2|3|       |4|             |                               |
+        *   +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
+        *   |     Extended payload length continued, if payload len == 127  |
+        *   + - - - - - - - - - - - - - - - +-------------------------------+
+        *   |                               |         Extension data        |
+        *   +-------------------------------+ - - - - - - - - - - - - - - - +
+        *   :                                                               :
+        *   +---------------------------------------------------------------+
+        *   :                       Application data                        :
+        *   +---------------------------------------------------------------+
+        *
+        *  We pass payload through to userland as soon as we get it, ignoring
+        *  FIN.  It's up to userland to buffer it up if it wants to see a
+        *  whole unfragmented block of the original size (which may be up to
+        *  2^63 long!)
+        */
+
+       case LWS_RXPS_04_FRAME_HDR_1:
+handle_first:
+
+               wsi->u.ws.opcode = c & 0xf;
+               wsi->u.ws.rsv = c & 0x70;
+               wsi->u.ws.final = !!((c >> 7) & 1);
+
+               switch (wsi->u.ws.opcode) {
+               case LWS_WS_OPCODE_07__TEXT_FRAME:
+               case LWS_WS_OPCODE_07__BINARY_FRAME:
+                       wsi->u.ws.frame_is_binary =
+                            wsi->u.ws.opcode == LWS_WS_OPCODE_07__BINARY_FRAME;
+                       break;
+               }
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN:
+
+               wsi->u.ws.this_frame_masked = !!(c & 0x80);
+
+               switch (c & 0x7f) {
+               case 126:
+                       /* control frames are not allowed to have big lengths */
+                       if (wsi->u.ws.opcode & 8)
+                               goto illegal_ctl_length;
+
+                       wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_2;
+                       break;
+               case 127:
+                       /* control frames are not allowed to have big lengths */
+                       if (wsi->u.ws.opcode & 8)
+                               goto illegal_ctl_length;
+
+                       wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_8;
+                       break;
+               default:
+                       wsi->u.ws.rx_packet_length = c & 0x7f;
+                       if (wsi->u.ws.this_frame_masked)
+                               wsi->lws_rx_parse_state =
+                                               LWS_RXPS_07_COLLECT_FRAME_KEY_1;
+                       else
+                               wsi->lws_rx_parse_state =
+                                       LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
+                       break;
+               }
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN16_2:
+               wsi->u.ws.rx_packet_length = c << 8;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_1;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN16_1:
+               wsi->u.ws.rx_packet_length |= c;
+               if (wsi->u.ws.this_frame_masked)
+                       wsi->lws_rx_parse_state =
+                                       LWS_RXPS_07_COLLECT_FRAME_KEY_1;
+               else
+                       wsi->lws_rx_parse_state =
+                               LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_8:
+               if (c & 0x80) {
+                       lwsl_warn("b63 of length must be zero\n");
+                       /* kill the connection */
+                       return -1;
+               }
+#if defined __LP64__
+               wsi->u.ws.rx_packet_length = ((size_t)c) << 56;
+#else
+               wsi->u.ws.rx_packet_length = 0;
+#endif
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_7;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_7:
+#if defined __LP64__
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 48;
+#endif
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_6;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_6:
+#if defined __LP64__
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 40;
+#endif
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_5;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_5:
+#if defined __LP64__
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 32;
+#endif
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_4;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_4:
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 24;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_3;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_3:
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 16;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_2;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_2:
+               wsi->u.ws.rx_packet_length |= ((size_t)c) << 8;
+               wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_1;
+               break;
+
+       case LWS_RXPS_04_FRAME_HDR_LEN64_1:
+               wsi->u.ws.rx_packet_length |= ((size_t)c);
+               if (wsi->u.ws.this_frame_masked)
+                       wsi->lws_rx_parse_state =
+                                       LWS_RXPS_07_COLLECT_FRAME_KEY_1;
+               else
+                       wsi->lws_rx_parse_state =
+                               LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
+               break;
+
+       case LWS_RXPS_07_COLLECT_FRAME_KEY_1:
+               wsi->u.ws.frame_masking_nonce_04[0] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_2;
+               break;
+
+       case LWS_RXPS_07_COLLECT_FRAME_KEY_2:
+               wsi->u.ws.frame_masking_nonce_04[1] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_3;
+               break;
+
+       case LWS_RXPS_07_COLLECT_FRAME_KEY_3:
+               wsi->u.ws.frame_masking_nonce_04[2] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_4;
+               break;
+
+       case LWS_RXPS_07_COLLECT_FRAME_KEY_4:
+               wsi->u.ws.frame_masking_nonce_04[3] = c;
+               if (c)
+                       wsi->u.ws.all_zero_nonce = 0;
+               wsi->lws_rx_parse_state =
+                                       LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED;
+               wsi->u.ws.frame_mask_index = 0;
+               if (wsi->u.ws.rx_packet_length == 0)
+                       goto spill;
+               break;
+
+
+       case LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED:
+
+               if (!wsi->u.ws.rx_user_buffer)
+                       lwsl_err("NULL user buffer...\n");
+
+               if (wsi->u.ws.all_zero_nonce)
+                       wsi->u.ws.rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING +
+                              (wsi->u.ws.rx_user_buffer_head++)] = c;
+               else
+                       wsi->u.ws.rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING +
+                              (wsi->u.ws.rx_user_buffer_head++)] =
+                                  c ^ wsi->u.ws.frame_masking_nonce_04[
+                                           (wsi->u.ws.frame_mask_index++) & 3];
+
+               if (--wsi->u.ws.rx_packet_length == 0) {
+                       /* spill because we have the whole frame */
+                       wsi->lws_rx_parse_state = LWS_RXPS_NEW;
+                       goto spill;
+               }
+
+               /*
+                * if there's no protocol max frame size given, we are
+                * supposed to default to LWS_MAX_SOCKET_IO_BUF
+                */
+
+               if (!wsi->protocol->rx_buffer_size &&
+                                       wsi->u.ws.rx_user_buffer_head !=
+                                                         LWS_MAX_SOCKET_IO_BUF)
+                       break;
+               else
+                       if (wsi->protocol->rx_buffer_size &&
+                                       wsi->u.ws.rx_user_buffer_head !=
+                                                 wsi->protocol->rx_buffer_size)
+                       break;
+
+               /* spill because we filled our rx buffer */
+spill:
+               /*
+                * is this frame a control packet we should take care of at this
+                * layer?  If so service it and hide it from the user callback
+                */
+
+               lwsl_parser("spill on %s\n", wsi->protocol->name);
+
+               switch (wsi->u.ws.opcode) {
+               case LWS_WS_OPCODE_07__CLOSE:
+                       /* is this an acknowledgement of our close? */
+                       if (wsi->state == WSI_STATE_AWAITING_CLOSE_ACK) {
+                               /*
+                                * fine he has told us he is closing too, let's
+                                * finish our close
+                                */
+                               lwsl_parser("seen client close ack\n");
+                               return -1;
+                       }
+                       lwsl_parser("server sees client close packet\n");
+                       /* parrot the close packet payload back */
+                       n = libwebsocket_write(wsi, (unsigned char *)
+                               &wsi->u.ws.rx_user_buffer[
+                                       LWS_SEND_BUFFER_PRE_PADDING],
+                                       wsi->u.ws.rx_user_buffer_head,
+                                                              LWS_WRITE_CLOSE);
+                       if (n < 0)
+                               lwsl_info("write of close ack failed %d\n", n);
+                       wsi->state = WSI_STATE_RETURNED_CLOSE_ALREADY;
+                       /* close the connection */
+                       return -1;
+
+               case LWS_WS_OPCODE_07__PING:
+                       lwsl_info("received %d byte ping, sending pong\n",
+                                                wsi->u.ws.rx_user_buffer_head);
+                       lwsl_hexdump(&wsi->u.ws.rx_user_buffer[
+                                       LWS_SEND_BUFFER_PRE_PADDING],
+                                                wsi->u.ws.rx_user_buffer_head);
+                       /* parrot the ping packet payload back as a pong */
+                       n = libwebsocket_write(wsi, (unsigned char *)
+                       &wsi->u.ws.rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING],
+                                wsi->u.ws.rx_user_buffer_head, LWS_WRITE_PONG);
+                       if (n < 0)
+                               return -1;
+                       /* ... then just drop it */
+                       wsi->u.ws.rx_user_buffer_head = 0;
+                       return 0;
+
+               case LWS_WS_OPCODE_07__PONG:
+                       /* ... then just drop it */
+                       wsi->u.ws.rx_user_buffer_head = 0;
+                       return 0;
+
+               case LWS_WS_OPCODE_07__TEXT_FRAME:
+               case LWS_WS_OPCODE_07__BINARY_FRAME:
+               case LWS_WS_OPCODE_07__CONTINUATION:
+                       break;
+
+               default:
+#ifndef LWS_NO_EXTENSIONS
+                       lwsl_parser("passing opc %x up to exts\n",
+                                                       wsi->u.ws.opcode);
+
+                       /*
+                        * It's something special we can't understand here.
+                        * Pass the payload up to the extension's parsing
+                        * state machine.
+                        */
+
+                       eff_buf.token = &wsi->u.ws.rx_user_buffer[
+                                                  LWS_SEND_BUFFER_PRE_PADDING];
+                       eff_buf.token_len = wsi->u.ws.rx_user_buffer_head;
+
+                       handled = 0;
+                       for (n = 0; n < wsi->count_active_extensions; n++) {
+                               m = wsi->active_extensions[n]->callback(
+                                       wsi->protocol->owning_server,
+                                       wsi->active_extensions[n], wsi,
+                                       LWS_EXT_CALLBACK_EXTENDED_PAYLOAD_RX,
+                                           wsi->active_extensions_user[n],
+                                                                  &eff_buf, 0);
+                               if (m)
+                                       handled = 1;
+                       }
+
+                       if (!handled)
+#endif
+                               lwsl_ext("ext opc opcode 0x%x unknown\n",
+                                                             wsi->u.ws.opcode);
+
+                       wsi->u.ws.rx_user_buffer_head = 0;
+                       return 0;
+               }
+
+               /*
+                * No it's real payload, pass it up to the user callback.
+                * It's nicely buffered with the pre-padding taken care of
+                * so it can be sent straight out again using libwebsocket_write
+                */
+
+               eff_buf.token = &wsi->u.ws.rx_user_buffer[
+                                               LWS_SEND_BUFFER_PRE_PADDING];
+               eff_buf.token_len = wsi->u.ws.rx_user_buffer_head;
+#ifndef LWS_NO_EXTENSIONS
+               for (n = 0; n < wsi->count_active_extensions; n++) {
+                       m = wsi->active_extensions[n]->callback(
+                               wsi->protocol->owning_server,
+                               wsi->active_extensions[n], wsi,
+                               LWS_EXT_CALLBACK_PAYLOAD_RX,
+                               wsi->active_extensions_user[n],
+                               &eff_buf, 0);
+                       if (m < 0) {
+                               lwsl_ext(
+                                "Extension '%s' failed to handle payload!\n",
+                                             wsi->active_extensions[n]->name);
+                               return -1;
+                       }
+               }
+#endif
+               if (eff_buf.token_len > 0) {
+                       eff_buf.token[eff_buf.token_len] = '\0';
+
+                       if (wsi->protocol->callback)
+                               ret = user_callback_handle_rxflow(
+                                               wsi->protocol->callback,
+                                               wsi->protocol->owning_server,
+                                               wsi, LWS_CALLBACK_RECEIVE,
+                                               wsi->user_space,
+                                               eff_buf.token,
+                                               eff_buf.token_len);
+                   else
+                           lwsl_err("No callback on payload spill!\n");
+               }
+
+               wsi->u.ws.rx_user_buffer_head = 0;
+               break;
+       }
+
+       return ret;
+
+illegal_ctl_length:
+
+       lwsl_warn("Control frame with xtended length is illegal\n");
+       /* kill the connection */
+       return -1;
+}
+
+
+int libwebsocket_interpret_incoming_packet(struct libwebsocket *wsi,
+                                                unsigned char *buf, size_t len)
+{
+       size_t n;
+       int m;
+       int clear_rxflow = !!wsi->u.ws.rxflow_buffer;
+       struct libwebsocket_context *context = wsi->protocol->owning_server;
+
+#if 0
+       lwsl_parser("received %d byte packet\n", (int)len);
+       lwsl_hexdump(buf, len);
+#endif
+
+       if (buf && wsi->u.ws.rxflow_buffer)
+               lwsl_err("!!!! pending rxflow data loss\n");
+
+       /* let the rx protocol state machine have as much as it needs */
+
+       n = 0;
+       if (!buf) {
+               lwsl_info("dumping stored rxflow buffer len %d pos=%d\n",
+                                   wsi->u.ws.rxflow_len, wsi->u.ws.rxflow_pos);
+               buf = wsi->u.ws.rxflow_buffer;
+               n = wsi->u.ws.rxflow_pos;
+               len = wsi->u.ws.rxflow_len;
+               /* let's pretend he's already allowing input */
+               context->fds[wsi->position_in_fds_table].events |= POLLIN;
+       }
+
+       while (n < len) {
+               if (!(context->fds[wsi->position_in_fds_table].events &
+                                                                     POLLIN)) {
+                       /* his RX is flowcontrolled */
+                       if (!wsi->u.ws.rxflow_buffer) {
+                               /* a new rxflow, buffer it and warn caller */
+                               lwsl_info("new rxflow input buffer len %d\n",
+                                                                      len - n);
+                               wsi->u.ws.rxflow_buffer =
+                                              (unsigned char *)malloc(len - n);
+                               wsi->u.ws.rxflow_len = len - n;
+                               wsi->u.ws.rxflow_pos = 0;
+                               memcpy(wsi->u.ws.rxflow_buffer,
+                                                       buf + n, len - n);
+                       } else {
+                               lwsl_info("re-using rxflow input buffer\n");
+                               /* rxflow while we were spilling prev rxflow */
+                               wsi->u.ws.rxflow_pos = n;
+                       }
+                       return 1;
+               }
+               m = libwebsocket_rx_sm(wsi, buf[n]);
+               if (m < 0)
+                       return -1;
+               n++;
+       }
+
+       if (clear_rxflow) {
+               lwsl_info("flow: clearing it\n");
+               free(wsi->u.ws.rxflow_buffer);
+               wsi->u.ws.rxflow_buffer = NULL;
+               context->fds[wsi->position_in_fds_table].events &= ~POLLIN;
+       }
+
+       return 0;
+}
+
+
+/**
+ * libwebsockets_remaining_packet_payload() - Bytes to come before "overall"
+ *                                           rx packet is complete
+ * @wsi:               Websocket instance (available from user callback)
+ *
+ *     This function is intended to be called from the callback if the
+ *  user code is interested in "complete packets" from the client.
+ *  libwebsockets just passes through payload as it comes and issues a buffer
+ *  additionally when it hits a built-in limit.  The LWS_CALLBACK_RECEIVE
+ *  callback handler can use this API to find out if the buffer it has just
+ *  been given is the last piece of a "complete packet" from the client --
+ *  when that is the case libwebsockets_remaining_packet_payload() will return
+ *  0.
+ *
+ *  Many protocols won't care becuse their packets are always small.
+ */
+
+size_t
+libwebsockets_remaining_packet_payload(struct libwebsocket *wsi)
+{
+       return wsi->u.ws.rx_packet_length;
+}
diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
new file mode 100644 (file)
index 0000000..f1ff5c8
--- /dev/null
@@ -0,0 +1,532 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010 - 2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+/* System introspection configs */
+#ifdef CMAKE_BUILD
+#include "lws_config.h"
+#else
+#ifdef WIN32
+#define inline __inline
+#else
+#include "config.h"
+#endif
+#endif
+
+#if _MSC_VER > 1000 || defined(_WIN32)
+#else
+#include <unistd.h>
+#include <strings.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <limits.h>
+#ifdef __MINGW64__
+#else
+#ifdef __MINGW32__
+#elif _MSC_VER > 1000 || defined(_WIN32)
+#else
+#include <netdb.h>
+#endif
+#endif
+#include <stdarg.h>
+
+#include <sys/stat.h>
+
+#ifdef WIN32
+#define LWS_NO_DAEMONIZE
+
+#define compatible_close(fd) closesocket(fd);
+#ifdef __MINGW64__
+#else
+#ifdef __MINGW32__
+#else
+#include <time.h >
+#endif
+#endif
+#include <winsock2.h>
+#include <ws2ipdef.h>
+#include <windows.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifndef LWS_NO_FORK
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+#endif
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+
+#include <poll.h>
+#include <sys/mman.h>
+#include <sys/time.h>
+
+#define compatible_close(fd) close(fd);
+#endif
+
+#ifdef LWS_OPENSSL_SUPPORT
+#ifdef USE_CYASSL
+#include <cyassl/openssl/ssl.h>
+#include <cyassl/error.h>
+unsigned char *
+SHA1(const unsigned char *d, size_t n, unsigned char *md);
+#else
+#include <openssl/ssl.h>
+#include <openssl/evp.h>
+#include <openssl/err.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#endif /* not USE_CYASSL */
+#endif
+
+#include "libwebsockets.h"
+
+/*
+ * Mac OSX as well as iOS do not define the MSG_NOSIGNAL flag,
+ * but happily have something equivalent in the SO_NOSIGPIPE flag.
+ */
+#ifdef __APPLE__
+#define MSG_NOSIGNAL SO_NOSIGPIPE
+#endif
+
+#ifndef LWS_MAX_HEADER_LEN
+#define LWS_MAX_HEADER_LEN 1024
+#endif
+#ifndef LWS_MAX_PROTOCOLS
+#define LWS_MAX_PROTOCOLS 5
+#endif
+#ifndef LWS_MAX_EXTENSIONS_ACTIVE
+#define LWS_MAX_EXTENSIONS_ACTIVE 3
+#endif
+#ifndef SPEC_LATEST_SUPPORTED
+#define SPEC_LATEST_SUPPORTED 13
+#endif
+#ifndef AWAITING_TIMEOUT
+#define AWAITING_TIMEOUT 5
+#endif
+#ifndef CIPHERS_LIST_STRING
+#define CIPHERS_LIST_STRING "DEFAULT"
+#endif
+#ifndef LWS_SOMAXCONN
+#define LWS_SOMAXCONN SOMAXCONN
+#endif
+
+#define MAX_WEBSOCKET_04_KEY_LEN 128
+#define LWS_MAX_SOCKET_IO_BUF 4096
+
+#ifndef SYSTEM_RANDOM_FILEPATH
+#define SYSTEM_RANDOM_FILEPATH "/dev/urandom"
+#endif
+#ifndef LWS_MAX_ZLIB_CONN_BUFFER
+#define LWS_MAX_ZLIB_CONN_BUFFER (64 * 1024)
+#endif
+
+/*
+ * if not in a connection storm, check for incoming
+ * connections this many normal connection services
+ */
+#define LWS_LISTEN_SERVICE_MODULO 10
+
+enum lws_websocket_opcodes_07 {
+       LWS_WS_OPCODE_07__CONTINUATION = 0,
+       LWS_WS_OPCODE_07__TEXT_FRAME = 1,
+       LWS_WS_OPCODE_07__BINARY_FRAME = 2,
+
+       LWS_WS_OPCODE_07__NOSPEC__MUX = 7,
+
+       /* control extensions 8+ */
+
+       LWS_WS_OPCODE_07__CLOSE = 8,
+       LWS_WS_OPCODE_07__PING = 9,
+       LWS_WS_OPCODE_07__PONG = 0xa,
+};
+
+
+enum lws_connection_states {
+       WSI_STATE_HTTP,
+       WSI_STATE_HTTP_ISSUING_FILE,
+       WSI_STATE_HTTP_HEADERS,
+       WSI_STATE_DEAD_SOCKET,
+       WSI_STATE_ESTABLISHED,
+       WSI_STATE_CLIENT_UNCONNECTED,
+       WSI_STATE_RETURNED_CLOSE_ALREADY,
+       WSI_STATE_AWAITING_CLOSE_ACK,
+};
+
+enum lws_rx_parse_state {
+       LWS_RXPS_NEW,
+
+       LWS_RXPS_04_MASK_NONCE_1,
+       LWS_RXPS_04_MASK_NONCE_2,
+       LWS_RXPS_04_MASK_NONCE_3,
+
+       LWS_RXPS_04_FRAME_HDR_1,
+       LWS_RXPS_04_FRAME_HDR_LEN,
+       LWS_RXPS_04_FRAME_HDR_LEN16_2,
+       LWS_RXPS_04_FRAME_HDR_LEN16_1,
+       LWS_RXPS_04_FRAME_HDR_LEN64_8,
+       LWS_RXPS_04_FRAME_HDR_LEN64_7,
+       LWS_RXPS_04_FRAME_HDR_LEN64_6,
+       LWS_RXPS_04_FRAME_HDR_LEN64_5,
+       LWS_RXPS_04_FRAME_HDR_LEN64_4,
+       LWS_RXPS_04_FRAME_HDR_LEN64_3,
+       LWS_RXPS_04_FRAME_HDR_LEN64_2,
+       LWS_RXPS_04_FRAME_HDR_LEN64_1,
+
+       LWS_RXPS_07_COLLECT_FRAME_KEY_1,
+       LWS_RXPS_07_COLLECT_FRAME_KEY_2,
+       LWS_RXPS_07_COLLECT_FRAME_KEY_3,
+       LWS_RXPS_07_COLLECT_FRAME_KEY_4,
+
+       LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED
+};
+
+
+enum connection_mode {
+       LWS_CONNMODE_HTTP_SERVING,
+
+       LWS_CONNMODE_WS_SERVING,
+       LWS_CONNMODE_WS_CLIENT,
+
+       /* transient, ssl delay hiding */
+       LWS_CONNMODE_SSL_ACK_PENDING,
+
+       /* transient modes */
+       LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY,
+       LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE,
+       LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY,
+       LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT,
+       LWS_CONNMODE_WS_CLIENT_PENDING_CANDIDATE_CHILD,
+
+       /* special internal types */
+       LWS_CONNMODE_SERVER_LISTENER,
+};
+
+struct libwebsocket_protocols;
+struct libwebsocket;
+
+struct libwebsocket_context {
+       struct pollfd *fds;
+       struct libwebsocket **lws_lookup; /* fd to wsi */
+       int fds_count;
+       int max_fds;
+       int listen_port;
+       char http_proxy_address[128];
+       char canonical_hostname[128];
+       unsigned int http_proxy_port;
+       unsigned int options;
+       unsigned long last_timeout_check_s;
+
+       /*
+        * usable by anything in the service code, but only if the scope
+        * does not last longer than the service action (since next service
+        * of any socket can likewise use it and overwrite)
+        */
+       unsigned char service_buffer[LWS_MAX_SOCKET_IO_BUF];
+
+       int started_with_parent;
+
+       int fd_random;
+       int listen_service_modulo;
+       int listen_service_count;
+       int listen_service_fd;
+       int listen_service_extraseen;
+
+       int ka_time;
+       int ka_probes;
+       int ka_interval;
+
+#ifdef LWS_LATENCY
+       unsigned long worst_latency;
+       char worst_latency_info[256];
+#endif
+
+#ifdef LWS_OPENSSL_SUPPORT
+       int use_ssl;
+       SSL_CTX *ssl_ctx;
+       SSL_CTX *ssl_client_ctx;
+#endif
+       struct libwebsocket_protocols *protocols;
+       int count_protocols;
+#ifndef LWS_NO_EXTENSIONS
+       struct libwebsocket_extension *extensions;
+#endif
+       void *user_space;
+};
+
+
+enum pending_timeout {
+       NO_PENDING_TIMEOUT = 0,
+       PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE,
+       PENDING_TIMEOUT_ESTABLISH_WITH_SERVER,
+       PENDING_TIMEOUT_AWAITING_SERVER_RESPONSE,
+       PENDING_TIMEOUT_AWAITING_PING,
+       PENDING_TIMEOUT_CLOSE_ACK,
+       PENDING_TIMEOUT_AWAITING_EXTENSION_CONNECT_RESPONSE,
+       PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE,
+       PENDING_TIMEOUT_SSL_ACCEPT,
+};
+
+
+/*
+ * This is totally opaque to code using the library.  It's exported as a
+ * forward-reference pointer-only declaration; the user can use the pointer with
+ * other APIs to get information out of it.
+ */
+
+struct _lws_http_mode_related {
+       int fd;
+       unsigned long filepos;
+       unsigned long filelen;
+};
+
+struct lws_fragments {
+       unsigned short offset;
+       unsigned short len;
+       unsigned char next_frag_index;
+};
+
+struct allocated_headers {
+       unsigned short next_frag_index;
+       unsigned short pos;
+       unsigned char frag_index[WSI_TOKEN_COUNT];
+       struct lws_fragments frags[WSI_TOKEN_COUNT * 2];
+       char data[LWS_MAX_HEADER_LEN];
+#ifndef LWS_NO_CLIENT
+       char initial_handshake_hash_base64[30];
+       unsigned short c_port;
+#endif
+};
+
+struct _lws_header_related {
+       struct allocated_headers *ah;
+       short lextable_pos;
+       unsigned char parser_state; /* enum lws_token_indexes */
+};
+
+struct _lws_websocket_related {
+       char *rx_user_buffer;
+       int rx_user_buffer_head;
+       unsigned char frame_masking_nonce_04[4];
+       unsigned char frame_mask_index;
+       size_t rx_packet_length;
+       unsigned char opcode;
+       unsigned int final:1;
+       unsigned char rsv;
+       unsigned int frame_is_binary:1;
+       unsigned int all_zero_nonce:1;
+       short close_reason; /* enum lws_close_status */
+       unsigned char *rxflow_buffer;
+       int rxflow_len;
+       int rxflow_pos;
+       unsigned int rxflow_change_to:2;
+       unsigned int this_frame_masked:1;
+};
+
+struct libwebsocket {
+
+       /* lifetime members */
+
+       const struct libwebsocket_protocols *protocol;
+#ifndef LWS_NO_EXTENSIONS
+       struct libwebsocket_extension *
+                                  active_extensions[LWS_MAX_EXTENSIONS_ACTIVE];
+       void *active_extensions_user[LWS_MAX_EXTENSIONS_ACTIVE];
+       unsigned char count_active_extensions;
+       unsigned int extension_data_pending:1;
+#endif
+       unsigned char ietf_spec_revision;
+
+       char mode; /* enum connection_mode */
+       char state; /* enum lws_connection_states */
+       char lws_rx_parse_state; /* enum lws_rx_parse_state */
+       char rx_frame_type; /* enum libwebsocket_write_protocol */
+
+       unsigned int hdr_parsing_completed:1;
+
+       char pending_timeout; /* enum pending_timeout */
+       unsigned long pending_timeout_limit;
+
+       int sock;
+       int position_in_fds_table;
+#ifdef LWS_LATENCY
+       unsigned long action_start;
+       unsigned long latency_start;
+#endif
+
+       void *user_space;
+
+       /* members with mutually exclusive lifetimes are unionized */
+
+       union u {
+               struct _lws_http_mode_related http;
+               struct _lws_header_related hdr;
+               struct _lws_websocket_related ws;
+       } u;
+
+#ifdef LWS_OPENSSL_SUPPORT
+       SSL *ssl;
+       BIO *client_bio;
+       unsigned int use_ssl:2;
+#endif
+};
+
+LWS_EXTERN void
+libwebsocket_close_and_free_session(struct libwebsocket_context *context,
+                              struct libwebsocket *wsi, enum lws_close_status);
+
+#ifndef LWS_LATENCY
+static inline void lws_latency(struct libwebsocket_context *context,
+               struct libwebsocket *wsi, const char *action,
+                                        int ret, int completion) { while (0); }
+static inline void lws_latency_pre(struct libwebsocket_context *context,
+                                       struct libwebsocket *wsi) { while (0); }
+#else
+#define lws_latency_pre(_context, _wsi) lws_latency(_context, _wsi, NULL, 0, 0)
+extern void
+lws_latency(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi, const char *action,
+                                                      int ret, int completion);
+#endif
+
+LWS_EXTERN int
+libwebsocket_client_rx_sm(struct libwebsocket *wsi, unsigned char c);
+
+LWS_EXTERN int
+libwebsocket_parse(struct libwebsocket *wsi, unsigned char c);
+
+LWS_EXTERN int
+libwebsocket_interpret_incoming_packet(struct libwebsocket *wsi,
+                                               unsigned char *buf, size_t len);
+
+LWS_EXTERN int
+lws_b64_selftest(void);
+
+LWS_EXTERN struct libwebsocket *
+wsi_from_fd(struct libwebsocket_context *context, int fd);
+
+LWS_EXTERN int
+insert_wsi_socket_into_fds(struct libwebsocket_context *context,
+                                                     struct libwebsocket *wsi);
+
+LWS_EXTERN void
+libwebsocket_set_timeout(struct libwebsocket *wsi,
+                                        enum pending_timeout reason, int secs);
+
+LWS_EXTERN int
+lws_issue_raw(struct libwebsocket *wsi, unsigned char *buf, size_t len);
+
+
+LWS_EXTERN int
+libwebsocket_service_timeout_check(struct libwebsocket_context *context,
+                                   struct libwebsocket *wsi, unsigned int sec);
+
+LWS_EXTERN struct libwebsocket *
+__libwebsocket_client_connect_2(struct libwebsocket_context *context,
+       struct libwebsocket *wsi);
+
+LWS_EXTERN struct libwebsocket *
+libwebsocket_create_new_server_wsi(struct libwebsocket_context *context);
+
+LWS_EXTERN char *
+libwebsockets_generate_client_handshake(struct libwebsocket_context *context,
+               struct libwebsocket *wsi, char *pkt);
+
+LWS_EXTERN int
+lws_handle_POLLOUT_event(struct libwebsocket_context *context,
+                             struct libwebsocket *wsi, struct pollfd *pollfd);
+#ifndef LWS_NO_EXTENSIONS
+LWS_EXTERN int
+lws_any_extension_handled(struct libwebsocket_context *context,
+                         struct libwebsocket *wsi,
+                         enum libwebsocket_extension_callback_reasons r,
+                         void *v, size_t len);
+
+LWS_EXTERN void *
+lws_get_extension_user_matching_ext(struct libwebsocket *wsi,
+                         struct libwebsocket_extension *ext);
+#endif
+
+LWS_EXTERN int
+lws_client_interpret_server_handshake(struct libwebsocket_context *context,
+               struct libwebsocket *wsi);
+
+LWS_EXTERN int
+libwebsocket_rx_sm(struct libwebsocket *wsi, unsigned char c);
+
+LWS_EXTERN int
+lws_issue_raw_ext_access(struct libwebsocket *wsi,
+                                               unsigned char *buf, size_t len);
+
+LWS_EXTERN int
+_libwebsocket_rx_flow_control(struct libwebsocket *wsi);
+
+LWS_EXTERN int
+user_callback_handle_rxflow(callback_function,
+               struct libwebsocket_context *context,
+                       struct libwebsocket *wsi,
+                        enum libwebsocket_callback_reasons reason, void *user,
+                                                         void *in, size_t len);
+
+LWS_EXTERN int
+lws_set_socket_options(struct libwebsocket_context *context, int fd);
+
+LWS_EXTERN int
+lws_allocate_header_table(struct libwebsocket *wsi);
+
+LWS_EXTERN char *
+lws_hdr_simple_ptr(struct libwebsocket *wsi, enum lws_token_indexes h);
+
+LWS_EXTERN int
+lws_hdr_simple_create(struct libwebsocket *wsi,
+                               enum lws_token_indexes h, const char *s);
+
+LWS_EXTERN int
+libwebsocket_ensure_user_space(struct libwebsocket *wsi);
+
+#ifndef LWS_NO_SERVER
+LWS_EXTERN int handshake_0405(struct libwebsocket_context *context,
+                                                     struct libwebsocket *wsi);
+#endif
+
+#ifndef LWS_NO_DAEMONIZE
+LWS_EXTERN int get_daemonize_pid();
+#endif
+
+extern int interface_to_sa(const char *ifname,
+                     struct sockaddr_in *addr, size_t addrlen);
+
+#ifndef LWS_OPENSSL_SUPPORT
+
+unsigned char *
+SHA1(const unsigned char *d, size_t n, unsigned char *md);
+
+#else
+
+LWS_EXTERN int openssl_websocket_private_data_index;
+
+#endif
diff --git a/lib/server-handshake.c b/lib/server-handshake.c
new file mode 100644 (file)
index 0000000..53da4e7
--- /dev/null
@@ -0,0 +1,274 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "private-libwebsockets.h"
+
+#define LWS_CPYAPP(ptr, str) { strcpy(ptr, str); ptr += strlen(str); }
+
+/*
+ * Perform the newer BASE64-encoded handshake scheme
+ */
+
+int
+handshake_0405(struct libwebsocket_context *context, struct libwebsocket *wsi)
+{
+       unsigned char hash[20];
+       int n;
+       char *response;
+       char *p;
+       int accept_len;
+#ifndef LWS_NO_EXTENSIONS
+       char *c;
+       char ext_name[128];
+       struct libwebsocket_extension *ext;
+       int ext_count = 0;
+       int more = 1;
+#endif
+
+       if (!lws_hdr_total_length(wsi, WSI_TOKEN_HOST) ||
+                               !lws_hdr_total_length(wsi, WSI_TOKEN_KEY)) {
+               lwsl_parser("handshake_04 missing pieces\n");
+               /* completed header processing, but missing some bits */
+               goto bail;
+       }
+
+       if (lws_hdr_total_length(wsi, WSI_TOKEN_KEY) >=
+                                                    MAX_WEBSOCKET_04_KEY_LEN) {
+               lwsl_warn("Client key too long %d\n", MAX_WEBSOCKET_04_KEY_LEN);
+               goto bail;
+       }
+
+       /*
+        * since key length is restricted above (currently 128), cannot
+        * overflow
+        */
+       n = sprintf((char *)context->service_buffer,
+                               "%s258EAFA5-E914-47DA-95CA-C5AB0DC85B11",
+                               lws_hdr_simple_ptr(wsi, WSI_TOKEN_KEY));
+
+       SHA1(context->service_buffer, n, hash);
+
+       accept_len = lws_b64_encode_string((char *)hash, 20,
+                       (char *)context->service_buffer,
+                       sizeof(context->service_buffer));
+       if (accept_len < 0) {
+               lwsl_warn("Base64 encoded hash too long\n");
+               goto bail;
+       }
+
+       /* allocate the per-connection user memory (if any) */
+       if (libwebsocket_ensure_user_space(wsi))
+               goto bail;
+
+       /* create the response packet */
+
+       /* make a buffer big enough for everything */
+
+       response = (char *)context->service_buffer + MAX_WEBSOCKET_04_KEY_LEN;
+       p = response;
+       LWS_CPYAPP(p, "HTTP/1.1 101 Switching Protocols\x0d\x0a"
+                     "Upgrade: WebSocket\x0d\x0a"
+                     "Connection: Upgrade\x0d\x0a"
+                     "Sec-WebSocket-Accept: ");
+       strcpy(p, (char *)context->service_buffer);
+       p += accept_len;
+
+       if (lws_hdr_total_length(wsi, WSI_TOKEN_PROTOCOL)) {
+               LWS_CPYAPP(p, "\x0d\x0aSec-WebSocket-Protocol: ");
+               n = lws_hdr_copy(wsi, p, 128, WSI_TOKEN_PROTOCOL);
+               if (n < 0)
+                       goto bail;
+               p += n;
+       }
+
+#ifndef LWS_NO_EXTENSIONS
+       /*
+        * Figure out which extensions the client has that we want to
+        * enable on this connection, and give him back the list
+        */
+
+       if (lws_hdr_total_length(wsi, WSI_TOKEN_EXTENSIONS)) {
+
+               /*
+                * break down the list of client extensions
+                * and go through them
+                */
+
+               if (lws_hdr_copy(wsi, (char *)context->service_buffer,
+                               sizeof(context->service_buffer),
+                                                     WSI_TOKEN_EXTENSIONS) < 0)
+                       goto bail;
+
+               c = (char *)context->service_buffer;
+               lwsl_parser("WSI_TOKEN_EXTENSIONS = '%s'\n", c);
+               wsi->count_active_extensions = 0;
+               n = 0;
+               while (more) {
+
+                       if (*c && (*c != ',' && *c != ' ' && *c != '\t')) {
+                               ext_name[n] = *c++;
+                               if (n < sizeof(ext_name) - 1)
+                                       n++;
+                               continue;
+                       }
+                       ext_name[n] = '\0';
+                       if (!*c)
+                               more = 0;
+                       else {
+                               c++;
+                               if (!n)
+                                       continue;
+                       }
+
+                       /* check a client's extension against our support */
+
+                       ext = wsi->protocol->owning_server->extensions;
+
+                       while (ext && ext->callback) {
+
+                               if (strcmp(ext_name, ext->name)) {
+                                       ext++;
+                                       continue;
+                               }
+
+                               /*
+                                * oh, we do support this one he
+                                * asked for... but let's ask user
+                                * code if it's OK to apply it on this
+                                * particular connection + protocol
+                                */
+
+                               n = wsi->protocol->owning_server->
+                                       protocols[0].callback(
+                                               wsi->protocol->owning_server,
+                                               wsi,
+                                         LWS_CALLBACK_CONFIRM_EXTENSION_OKAY,
+                                                 wsi->user_space, ext_name, 0);
+
+                               /*
+                                * zero return from callback means
+                                * go ahead and allow the extension,
+                                * it's what we get if the callback is
+                                * unhandled
+                                */
+
+                               if (n) {
+                                       ext++;
+                                       continue;
+                               }
+
+                               /* apply it */
+
+                               if (ext_count)
+                                       *p++ = ',';
+                               else
+                                       LWS_CPYAPP(p,
+                                        "\x0d\x0aSec-WebSocket-Extensions: ");
+                               p += sprintf(p, "%s", ext_name);
+                               ext_count++;
+
+                               /* instantiate the extension on this conn */
+
+                               wsi->active_extensions_user[
+                                       wsi->count_active_extensions] =
+                                            malloc(ext->per_session_data_size);
+                               if (wsi->active_extensions_user[
+                                    wsi->count_active_extensions] == NULL) {
+                                       lwsl_err("Out of mem\n");
+                                       free(response);
+                                       goto bail;
+                               }
+                               memset(wsi->active_extensions_user[
+                                       wsi->count_active_extensions], 0,
+                                                   ext->per_session_data_size);
+
+                               wsi->active_extensions[
+                                         wsi->count_active_extensions] = ext;
+
+                               /* allow him to construct his context */
+
+                               ext->callback(wsi->protocol->owning_server,
+                                               ext, wsi,
+                                               LWS_EXT_CALLBACK_CONSTRUCT,
+                                               wsi->active_extensions_user[
+                                       wsi->count_active_extensions], NULL, 0);
+
+                               wsi->count_active_extensions++;
+                               lwsl_parser("count_active_extensions <- %d\n",
+                                                 wsi->count_active_extensions);
+
+                               ext++;
+                       }
+
+                       n = 0;
+               }
+       }
+#endif
+       /* end of response packet */
+
+       LWS_CPYAPP(p, "\x0d\x0a\x0d\x0a");
+
+#ifndef LWS_NO_EXTENSIONS
+       if (!lws_any_extension_handled(context, wsi,
+                       LWS_EXT_CALLBACK_HANDSHAKE_REPLY_TX,
+                                                    response, p - response)) {
+#else
+       {
+#endif
+               /* okay send the handshake response accepting the connection */
+
+               lwsl_parser("issuing resp pkt %d len\n", (int)(p - response));
+       #ifdef DEBUG
+               fwrite(response, 1,  p - response, stderr);
+       #endif
+               n = libwebsocket_write(wsi, (unsigned char *)response,
+                                                 p - response, LWS_WRITE_HTTP);
+               if (n != (p - response)) {
+                       lwsl_debug("handshake_0405: ERROR writing to socket\n");
+                       goto bail;
+               }
+
+       }
+
+       /* alright clean up and set ourselves into established state */
+
+       wsi->state = WSI_STATE_ESTABLISHED;
+       wsi->lws_rx_parse_state = LWS_RXPS_NEW;
+
+       /* notify user code that we're ready to roll */
+
+       if (wsi->protocol->callback)
+               wsi->protocol->callback(wsi->protocol->owning_server,
+                               wsi, LWS_CALLBACK_ESTABLISHED,
+                                         wsi->user_space, NULL, 0);
+
+       return 0;
+
+
+bail:
+       /* free up his parsing allocations */
+
+       if (wsi->u.hdr.ah)
+               free(wsi->u.hdr.ah);
+
+       return -1;
+}
+
diff --git a/lib/server.c b/lib/server.c
new file mode 100644 (file)
index 0000000..46aa182
--- /dev/null
@@ -0,0 +1,389 @@
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+
+#include "private-libwebsockets.h"
+
+#ifdef WIN32
+#include <tchar.h>
+#include <io.h>
+#else
+#ifdef LWS_BUILTIN_GETIFADDRS
+#include <getifaddrs.h>
+#else
+#include <ifaddrs.h>
+#endif
+#include <sys/un.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#endif
+
+#ifdef LWS_OPENSSL_SUPPORT
+
+static void
+libwebsockets_decode_ssl_error(void)
+{
+       char buf[256];
+       u_long err;
+
+       while ((err = ERR_get_error()) != 0) {
+               ERR_error_string_n(err, buf, sizeof(buf));
+               lwsl_err("*** %lu %s\n", err, buf);
+       }
+}
+#endif
+
+int
+interface_to_sa(const char *ifname, struct sockaddr_in *addr, size_t addrlen)
+{
+       int rc = -1;
+#ifdef WIN32
+       /* TODO */
+#else
+       struct ifaddrs *ifr;
+       struct ifaddrs *ifc;
+       struct sockaddr_in *sin;
+
+       getifaddrs(&ifr);
+       for (ifc = ifr; ifc != NULL; ifc = ifc->ifa_next) {
+               if (strcmp(ifc->ifa_name, ifname))
+                       continue;
+               if (ifc->ifa_addr == NULL)
+                       continue;
+               sin = (struct sockaddr_in *)ifc->ifa_addr;
+               if (sin->sin_family != AF_INET)
+                       continue;
+               memcpy(addr, sin, addrlen);
+               rc = 0;
+       }
+
+       freeifaddrs(ifr);
+#endif
+       return rc;
+}
+
+struct libwebsocket *
+libwebsocket_create_new_server_wsi(struct libwebsocket_context *context)
+{
+       struct libwebsocket *new_wsi;
+
+       new_wsi = (struct libwebsocket *)malloc(sizeof(struct libwebsocket));
+       if (new_wsi == NULL) {
+               lwsl_err("Out of memory for new connection\n");
+               return NULL;
+       }
+
+       memset(new_wsi, 0, sizeof(struct libwebsocket));
+#ifndef LWS_NO_EXTENSIONS
+       new_wsi->count_active_extensions = 0;
+#endif
+       new_wsi->pending_timeout = NO_PENDING_TIMEOUT;
+
+       /* intialize the instance struct */
+
+       new_wsi->state = WSI_STATE_HTTP;
+       new_wsi->mode = LWS_CONNMODE_HTTP_SERVING;
+       new_wsi->hdr_parsing_completed = 0;
+
+       if (lws_allocate_header_table(new_wsi)) {
+               free(new_wsi);
+               return NULL;
+       }
+
+       /*
+        * these can only be set once the protocol is known
+        * we set an unestablished connection's protocol pointer
+        * to the start of the supported list, so it can look
+        * for matching ones during the handshake
+        */
+       new_wsi->protocol = context->protocols;
+       new_wsi->user_space = NULL;
+       new_wsi->ietf_spec_revision = 0;
+
+       return new_wsi;
+}
+
+int lws_server_socket_service(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi, struct pollfd *pollfd)
+{
+       struct libwebsocket *new_wsi;
+       int accept_fd;
+       unsigned int clilen;
+       struct sockaddr_in cli_addr;
+       int n;
+       ssize_t len;
+#ifdef LWS_OPENSSL_SUPPORT
+       int m;
+#ifndef USE_CYASSL
+       BIO *bio;
+#endif
+#endif
+
+       switch (wsi->mode) {
+
+       case LWS_CONNMODE_HTTP_SERVING:
+
+               /* handle http headers coming in */
+
+               /* any incoming data ready? */
+
+               if (pollfd->revents & POLLIN) {
+
+       #ifdef LWS_OPENSSL_SUPPORT
+                       if (wsi->ssl)
+                               len = SSL_read(wsi->ssl,
+                                       context->service_buffer,
+                                              sizeof(context->service_buffer));
+                       else
+       #endif
+                               len = recv(pollfd->fd,
+                                       context->service_buffer,
+                                       sizeof(context->service_buffer), 0);
+
+                       if (len < 0) {
+                               lwsl_debug("Socket read returned %d\n", len);
+                               if (errno != EINTR && errno != EAGAIN)
+                                       libwebsocket_close_and_free_session(
+                                               context, wsi,
+                                               LWS_CLOSE_STATUS_NOSTATUS);
+                               return 0;
+                       }
+                       if (!len) {
+                               lwsl_info("lws_server_skt_srv: read 0 len\n");
+                               /* lwsl_info("   state=%d\n", wsi->state); */
+                               if (!wsi->hdr_parsing_completed)
+                                       free(wsi->u.hdr.ah);
+                               libwebsocket_close_and_free_session(
+                                      context, wsi, LWS_CLOSE_STATUS_NOSTATUS);
+                               return 0;
+                       }
+
+                       n = libwebsocket_read(context, wsi,
+                                               context->service_buffer, len);
+                       if (n < 0)
+                               /* we closed wsi */
+                               return 0;
+               }
+
+               /* this handles POLLOUT for http serving fragments */
+
+               if (!(pollfd->revents & POLLOUT))
+                       break;
+
+               /* one shot */
+               pollfd->events &= ~POLLOUT;
+
+               if (wsi->state != WSI_STATE_HTTP_ISSUING_FILE) {
+                       n = user_callback_handle_rxflow(
+                                       wsi->protocol->callback,
+                                       wsi->protocol->owning_server,
+                                       wsi, LWS_CALLBACK_HTTP_WRITEABLE,
+                                       wsi->user_space,
+                                       NULL,
+                                       0);
+                       if (n < 0)
+                               libwebsocket_close_and_free_session(
+                                      context, wsi, LWS_CLOSE_STATUS_NOSTATUS);
+                       break;
+               }
+
+               /* nonzero for completion or error */
+               if (libwebsockets_serve_http_file_fragment(context, wsi))
+                       libwebsocket_close_and_free_session(context, wsi,
+                                              LWS_CLOSE_STATUS_NOSTATUS);
+               break;
+
+       case LWS_CONNMODE_SERVER_LISTENER:
+
+               /* pollin means a client has connected to us then */
+
+               if (!(pollfd->revents & POLLIN))
+                       break;
+
+               /* listen socket got an unencrypted connection... */
+
+               clilen = sizeof(cli_addr);
+               lws_latency_pre(context, wsi);
+               accept_fd  = accept(pollfd->fd, (struct sockaddr *)&cli_addr,
+                                                                      &clilen);
+               lws_latency(context, wsi,
+                       "unencrypted accept LWS_CONNMODE_SERVER_LISTENER",
+                                                    accept_fd, accept_fd >= 0);
+               if (accept_fd < 0) {
+                       if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                               lwsl_debug("accept asks to try again\n");
+                               break;
+                       }
+                       lwsl_warn("ERROR on accept: %s\n", strerror(errno));
+                       break;
+               }
+
+               lws_set_socket_options(context, accept_fd);
+
+               /*
+                * look at who we connected to and give user code a chance
+                * to reject based on client IP.  There's no protocol selected
+                * yet so we issue this to protocols[0]
+                */
+
+               if ((context->protocols[0].callback)(context, wsi,
+                               LWS_CALLBACK_FILTER_NETWORK_CONNECTION,
+                                          NULL, (void *)(long)accept_fd, 0)) {
+                       lwsl_debug("Callback denied network connection\n");
+                       compatible_close(accept_fd);
+                       break;
+               }
+
+               new_wsi = libwebsocket_create_new_server_wsi(context);
+               if (new_wsi == NULL) {
+                       compatible_close(accept_fd);
+                       break;
+               }
+
+               new_wsi->sock = accept_fd;
+
+#ifdef LWS_OPENSSL_SUPPORT
+               new_wsi->ssl = NULL;
+               if (!context->use_ssl) {
+#endif
+
+                       lwsl_debug("accepted new conn  port %u on fd=%d\n",
+                                         ntohs(cli_addr.sin_port), accept_fd);
+
+                       insert_wsi_socket_into_fds(context, new_wsi);
+                       break;
+#ifdef LWS_OPENSSL_SUPPORT
+               }
+
+               new_wsi->ssl = SSL_new(context->ssl_ctx);
+               if (new_wsi->ssl == NULL) {
+                       lwsl_err("SSL_new failed: %s\n",
+                           ERR_error_string(SSL_get_error(
+                           new_wsi->ssl, 0), NULL));
+                           libwebsockets_decode_ssl_error();
+                       free(new_wsi);
+                       compatible_close(accept_fd);
+                       break;
+               }
+
+               SSL_set_ex_data(new_wsi->ssl,
+                       openssl_websocket_private_data_index, context);
+
+               SSL_set_fd(new_wsi->ssl, accept_fd);
+
+               #ifdef USE_CYASSL
+               CyaSSL_set_using_nonblock(new_wsi->ssl, 1);
+               #else
+               bio = SSL_get_rbio(new_wsi->ssl);
+               if (bio)
+                       BIO_set_nbio(bio, 1); /* nonblocking */
+               else
+                       lwsl_notice("NULL rbio\n");
+               bio = SSL_get_wbio(new_wsi->ssl);
+               if (bio)
+                       BIO_set_nbio(bio, 1); /* nonblocking */
+               else
+                       lwsl_notice("NULL rbio\n");
+               #endif
+
+               /*
+                * we are not accepted yet, but we need to enter ourselves
+                * as a live connection.  That way we can retry when more
+                * pieces come if we're not sorted yet
+                */
+
+               wsi = new_wsi;
+               wsi->mode = LWS_CONNMODE_SSL_ACK_PENDING;
+               insert_wsi_socket_into_fds(context, wsi);
+
+               libwebsocket_set_timeout(wsi, PENDING_TIMEOUT_SSL_ACCEPT,
+                                                       AWAITING_TIMEOUT);
+
+               lwsl_info("inserted SSL accept into fds, trying SSL_accept\n");
+
+               /* fallthru */
+
+       case LWS_CONNMODE_SSL_ACK_PENDING:
+
+               pollfd->events &= ~POLLOUT;
+
+               /* external POLL support via protocol 0 */
+               context->protocols[0].callback(context, wsi,
+                       LWS_CALLBACK_CLEAR_MODE_POLL_FD,
+                       wsi->user_space, (void *)(long)wsi->sock, POLLOUT);
+
+               lws_latency_pre(context, wsi);
+               n = SSL_accept(wsi->ssl);
+               lws_latency(context, wsi,
+                       "SSL_accept LWS_CONNMODE_SSL_ACK_PENDING\n", n, n == 1);
+
+               if (n != 1) {
+                       m = SSL_get_error(wsi->ssl, n);
+                       lwsl_debug("SSL_accept failed %d / %s\n",
+                                                 m, ERR_error_string(m, NULL));
+
+                       if (m == SSL_ERROR_WANT_READ) {
+                               context->fds[
+                                  wsi->position_in_fds_table].events |= POLLIN;
+
+                               /* external POLL support via protocol 0 */
+                               context->protocols[0].callback(context, wsi,
+                                       LWS_CALLBACK_SET_MODE_POLL_FD,
+                                       wsi->user_space,
+                                       (void *)(long)wsi->sock, POLLIN);
+                               lwsl_info("SSL_ERROR_WANT_READ\n");
+                               break;
+                       }
+                       if (m == SSL_ERROR_WANT_WRITE) {
+                               context->fds[
+                                 wsi->position_in_fds_table].events |= POLLOUT;
+
+                               /* external POLL support via protocol 0 */
+                               context->protocols[0].callback(context, wsi,
+                                       LWS_CALLBACK_SET_MODE_POLL_FD,
+                                       wsi->user_space,
+                                       (void *)(long)wsi->sock, POLLOUT);
+                               break;
+                       }
+                       lwsl_debug("SSL_accept failed skt %u: %s\n",
+                             pollfd->fd,
+                             ERR_error_string(m, NULL));
+                       libwebsocket_close_and_free_session(context, wsi,
+                                                    LWS_CLOSE_STATUS_NOSTATUS);
+                       break;
+               }
+
+               /* OK, we are accepted */
+
+               libwebsocket_set_timeout(wsi, NO_PENDING_TIMEOUT, 0);
+
+               wsi->mode = LWS_CONNMODE_HTTP_SERVING;
+
+               lwsl_debug("accepted new SSL conn\n");
+               break;
+#endif
+
+       default:
+               break;
+       }
+       return 0;
+}
+
diff --git a/lib/sha-1.c b/lib/sha-1.c
new file mode 100644 (file)
index 0000000..6020c22
--- /dev/null
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
+ * based on: http://csrc.nist.gov/fips/fip180-1.txt
+ * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
+ */
+
+#include <sys/types.h>
+#ifdef WIN32
+
+#ifndef BIG_ENDIAN
+#define BIG_ENDIAN    4321  /* to show byte order (taken from gcc) */
+#endif
+#ifndef LITTLE_ENDIAN
+#define LITTLE_ENDIAN 1234
+#endif
+#ifndef BYTE_ORDER
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif
+
+typedef unsigned __int64 u_int64_t;
+
+#undef __P
+#ifndef __P
+#if __STDC__
+#define __P(protos) protos
+#else
+#define __P(protos) ()
+#endif
+#endif
+
+#define bzero(b, len) (memset((b), '\0', (len)), (void) 0)
+
+#else
+#include <sys/stat.h>
+#include <sys/cdefs.h>
+#include <sys/time.h>
+#endif
+
+#include <string.h>
+
+struct sha1_ctxt {
+       union {
+               unsigned char           b8[20];
+               unsigned int            b32[5];
+       } h;
+       union {
+               unsigned char           b8[8];
+               u_int64_t               b64[1];
+       } c;
+       union {
+               unsigned char           b8[64];
+               unsigned int            b32[16];
+       } m;
+       unsigned char                   count;
+};
+
+/* sanity check */
+#if BYTE_ORDER != BIG_ENDIAN
+# if BYTE_ORDER != LITTLE_ENDIAN
+#  define unsupported 1
+# endif
+#endif
+
+#ifndef unsupported
+
+/* constant table */
+static const unsigned int _K[] =
+                       { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
+#define        K(t)    _K[(t) / 20]
+
+#define        F0(b, c, d)     (((b) & (c)) | ((~(b)) & (d)))
+#define        F1(b, c, d)     (((b) ^ (c)) ^ (d))
+#define        F2(b, c, d)     (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
+#define        F3(b, c, d)     (((b) ^ (c)) ^ (d))
+
+#define        S(n, x)         (((x) << (n)) | ((x) >> (32 - n)))
+
+#define        H(n)    (ctxt->h.b32[(n)])
+#define        COUNT   (ctxt->count)
+#define        BCOUNT  (ctxt->c.b64[0] / 8)
+#define        W(n)    (ctxt->m.b32[(n)])
+
+#define        PUTBYTE(x)      { \
+       ctxt->m.b8[(COUNT % 64)] = (x);         \
+       COUNT++;                                \
+       COUNT %= 64;                            \
+       ctxt->c.b64[0] += 8;                    \
+       if (COUNT % 64 == 0)                    \
+               sha1_step(ctxt);                \
+       }
+
+#define        PUTPAD(x)       { \
+       ctxt->m.b8[(COUNT % 64)] = (x);         \
+       COUNT++;                                \
+       COUNT %= 64;                            \
+       if (COUNT % 64 == 0)                    \
+               sha1_step(ctxt);                \
+       }
+
+static void sha1_step __P((struct sha1_ctxt *));
+
+static void
+sha1_step(struct sha1_ctxt *ctxt)
+{
+       unsigned int    a, b, c, d, e, tmp;
+       size_t t, s;
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+       struct sha1_ctxt tctxt;
+
+       memcpy(&tctxt.m.b8[0], &ctxt->m.b8[0], 64);
+       ctxt->m.b8[0] = tctxt.m.b8[3]; ctxt->m.b8[1] = tctxt.m.b8[2];
+       ctxt->m.b8[2] = tctxt.m.b8[1]; ctxt->m.b8[3] = tctxt.m.b8[0];
+       ctxt->m.b8[4] = tctxt.m.b8[7]; ctxt->m.b8[5] = tctxt.m.b8[6];
+       ctxt->m.b8[6] = tctxt.m.b8[5]; ctxt->m.b8[7] = tctxt.m.b8[4];
+       ctxt->m.b8[8] = tctxt.m.b8[11]; ctxt->m.b8[9] = tctxt.m.b8[10];
+       ctxt->m.b8[10] = tctxt.m.b8[9]; ctxt->m.b8[11] = tctxt.m.b8[8];
+       ctxt->m.b8[12] = tctxt.m.b8[15]; ctxt->m.b8[13] = tctxt.m.b8[14];
+       ctxt->m.b8[14] = tctxt.m.b8[13]; ctxt->m.b8[15] = tctxt.m.b8[12];
+       ctxt->m.b8[16] = tctxt.m.b8[19]; ctxt->m.b8[17] = tctxt.m.b8[18];
+       ctxt->m.b8[18] = tctxt.m.b8[17]; ctxt->m.b8[19] = tctxt.m.b8[16];
+       ctxt->m.b8[20] = tctxt.m.b8[23]; ctxt->m.b8[21] = tctxt.m.b8[22];
+       ctxt->m.b8[22] = tctxt.m.b8[21]; ctxt->m.b8[23] = tctxt.m.b8[20];
+       ctxt->m.b8[24] = tctxt.m.b8[27]; ctxt->m.b8[25] = tctxt.m.b8[26];
+       ctxt->m.b8[26] = tctxt.m.b8[25]; ctxt->m.b8[27] = tctxt.m.b8[24];
+       ctxt->m.b8[28] = tctxt.m.b8[31]; ctxt->m.b8[29] = tctxt.m.b8[30];
+       ctxt->m.b8[30] = tctxt.m.b8[29]; ctxt->m.b8[31] = tctxt.m.b8[28];
+       ctxt->m.b8[32] = tctxt.m.b8[35]; ctxt->m.b8[33] = tctxt.m.b8[34];
+       ctxt->m.b8[34] = tctxt.m.b8[33]; ctxt->m.b8[35] = tctxt.m.b8[32];
+       ctxt->m.b8[36] = tctxt.m.b8[39]; ctxt->m.b8[37] = tctxt.m.b8[38];
+       ctxt->m.b8[38] = tctxt.m.b8[37]; ctxt->m.b8[39] = tctxt.m.b8[36];
+       ctxt->m.b8[40] = tctxt.m.b8[43]; ctxt->m.b8[41] = tctxt.m.b8[42];
+       ctxt->m.b8[42] = tctxt.m.b8[41]; ctxt->m.b8[43] = tctxt.m.b8[40];
+       ctxt->m.b8[44] = tctxt.m.b8[47]; ctxt->m.b8[45] = tctxt.m.b8[46];
+       ctxt->m.b8[46] = tctxt.m.b8[45]; ctxt->m.b8[47] = tctxt.m.b8[44];
+       ctxt->m.b8[48] = tctxt.m.b8[51]; ctxt->m.b8[49] = tctxt.m.b8[50];
+       ctxt->m.b8[50] = tctxt.m.b8[49]; ctxt->m.b8[51] = tctxt.m.b8[48];
+       ctxt->m.b8[52] = tctxt.m.b8[55]; ctxt->m.b8[53] = tctxt.m.b8[54];
+       ctxt->m.b8[54] = tctxt.m.b8[53]; ctxt->m.b8[55] = tctxt.m.b8[52];
+       ctxt->m.b8[56] = tctxt.m.b8[59]; ctxt->m.b8[57] = tctxt.m.b8[58];
+       ctxt->m.b8[58] = tctxt.m.b8[57]; ctxt->m.b8[59] = tctxt.m.b8[56];
+       ctxt->m.b8[60] = tctxt.m.b8[63]; ctxt->m.b8[61] = tctxt.m.b8[62];
+       ctxt->m.b8[62] = tctxt.m.b8[61]; ctxt->m.b8[63] = tctxt.m.b8[60];
+#endif
+
+       a = H(0); b = H(1); c = H(2); d = H(3); e = H(4);
+
+       for (t = 0; t < 20; t++) {
+               s = t & 0x0f;
+               if (t >= 16)
+                       W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^
+                                                       W((s+2) & 0x0f) ^ W(s));
+
+               tmp = S(5, a) + F0(b, c, d) + e + W(s) + K(t);
+               e = d; d = c; c = S(30, b); b = a; a = tmp;
+       }
+       for (t = 20; t < 40; t++) {
+               s = t & 0x0f;
+               W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^
+                                                       W((s+2) & 0x0f) ^ W(s));
+               tmp = S(5, a) + F1(b, c, d) + e + W(s) + K(t);
+               e = d; d = c; c = S(30, b); b = a; a = tmp;
+       }
+       for (t = 40; t < 60; t++) {
+               s = t & 0x0f;
+               W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^
+                                                       W((s+2) & 0x0f) ^ W(s));
+               tmp = S(5, a) + F2(b, c, d) + e + W(s) + K(t);
+               e = d; d = c; c = S(30, b); b = a; a = tmp;
+       }
+       for (t = 60; t < 80; t++) {
+               s = t & 0x0f;
+               W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^
+                                                       W((s+2) & 0x0f) ^ W(s));
+               tmp = S(5, a) + F3(b, c, d) + e + W(s) + K(t);
+               e = d; d = c; c = S(30, b); b = a; a = tmp;
+       }
+
+       H(0) = H(0) + a;
+       H(1) = H(1) + b;
+       H(2) = H(2) + c;
+       H(3) = H(3) + d;
+       H(4) = H(4) + e;
+
+       bzero(&ctxt->m.b8[0], 64);
+}
+
+/*------------------------------------------------------------*/
+
+void
+sha1_init(struct sha1_ctxt *ctxt)
+{
+       bzero(ctxt, sizeof(struct sha1_ctxt));
+       H(0) = 0x67452301;
+       H(1) = 0xefcdab89;
+       H(2) = 0x98badcfe;
+       H(3) = 0x10325476;
+       H(4) = 0xc3d2e1f0;
+}
+
+void
+sha1_pad(struct sha1_ctxt *ctxt)
+{
+       size_t padlen;          /*pad length in bytes*/
+       size_t padstart;
+
+       PUTPAD(0x80);
+
+       padstart = COUNT % 64;
+       padlen = 64 - padstart;
+       if (padlen < 8) {
+               bzero(&ctxt->m.b8[padstart], padlen);
+               COUNT += padlen;
+               COUNT %= 64;
+               sha1_step(ctxt);
+               padstart = COUNT % 64;  /* should be 0 */
+               padlen = 64 - padstart; /* should be 64 */
+       }
+       bzero(&ctxt->m.b8[padstart], padlen - 8);
+       COUNT += (padlen - 8);
+       COUNT %= 64;
+#if BYTE_ORDER == BIG_ENDIAN
+       PUTPAD(ctxt->c.b8[0]); PUTPAD(ctxt->c.b8[1]);
+       PUTPAD(ctxt->c.b8[2]); PUTPAD(ctxt->c.b8[3]);
+       PUTPAD(ctxt->c.b8[4]); PUTPAD(ctxt->c.b8[5]);
+       PUTPAD(ctxt->c.b8[6]); PUTPAD(ctxt->c.b8[7]);
+#else
+       PUTPAD(ctxt->c.b8[7]); PUTPAD(ctxt->c.b8[6]);
+       PUTPAD(ctxt->c.b8[5]); PUTPAD(ctxt->c.b8[4]);
+       PUTPAD(ctxt->c.b8[3]); PUTPAD(ctxt->c.b8[2]);
+       PUTPAD(ctxt->c.b8[1]); PUTPAD(ctxt->c.b8[0]);
+#endif
+}
+
+void
+sha1_loop(struct sha1_ctxt *ctxt, const unsigned char *input, size_t len)
+{
+       size_t gaplen;
+       size_t gapstart;
+       size_t off;
+       size_t copysiz;
+
+       off = 0;
+
+       while (off < len) {
+               gapstart = COUNT % 64;
+               gaplen = 64 - gapstart;
+
+               copysiz = (gaplen < len - off) ? gaplen : len - off;
+               memcpy(&ctxt->m.b8[gapstart], &input[off], copysiz);
+               COUNT += copysiz;
+               COUNT %= 64;
+               ctxt->c.b64[0] += copysiz * 8;
+               if (COUNT % 64 == 0)
+                       sha1_step(ctxt);
+               off += copysiz;
+       }
+}
+
+void
+sha1_result(struct sha1_ctxt *ctxt, void *digest0)
+{
+       unsigned char *digest;
+
+       digest = (unsigned char *)digest0;
+       sha1_pad(ctxt);
+#if BYTE_ORDER == BIG_ENDIAN
+       memcpy(digest, &ctxt->h.b8[0], 20);
+#else
+       digest[0] = ctxt->h.b8[3]; digest[1] = ctxt->h.b8[2];
+       digest[2] = ctxt->h.b8[1]; digest[3] = ctxt->h.b8[0];
+       digest[4] = ctxt->h.b8[7]; digest[5] = ctxt->h.b8[6];
+       digest[6] = ctxt->h.b8[5]; digest[7] = ctxt->h.b8[4];
+       digest[8] = ctxt->h.b8[11]; digest[9] = ctxt->h.b8[10];
+       digest[10] = ctxt->h.b8[9]; digest[11] = ctxt->h.b8[8];
+       digest[12] = ctxt->h.b8[15]; digest[13] = ctxt->h.b8[14];
+       digest[14] = ctxt->h.b8[13]; digest[15] = ctxt->h.b8[12];
+       digest[16] = ctxt->h.b8[19]; digest[17] = ctxt->h.b8[18];
+       digest[18] = ctxt->h.b8[17]; digest[19] = ctxt->h.b8[16];
+#endif
+}
+
+/*
+ * This should look and work like the libcrypto implementation
+ */
+
+unsigned char *
+SHA1(const unsigned char *d, size_t n, unsigned char *md)
+{
+       struct sha1_ctxt ctx;
+
+       sha1_init(&ctx);
+       sha1_loop(&ctx, d, n);
+       sha1_result(&ctx, (void *)md);
+
+       return md;
+}
+
+#endif /*unsupported*/
diff --git a/libwebsockets-api-doc.html b/libwebsockets-api-doc.html
new file mode 100644 (file)
index 0000000..e4ad60b
--- /dev/null
@@ -0,0 +1,1037 @@
+<h2>libwebsocket_client_connect - Connect to another websocket server</h2>
+<i>struct libwebsocket *</i>
+<b>libwebsocket_client_connect</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>const char *</i> <b>address</b>,
+<i>int</i> <b>port</b>,
+<i>int</i> <b>ssl_connection</b>,
+<i>const char *</i> <b>path</b>,
+<i>const char *</i> <b>host</b>,
+<i>const char *</i> <b>origin</b>,
+<i>const char *</i> <b>protocol</b>,
+<i>int</i> <b>ietf_version_or_minus_one</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websocket context
+<dt><b>address</b>
+<dd>Remote server address, eg, "myserver.com"
+<dt><b>port</b>
+<dd>Port to connect to on the remote server, eg, 80
+<dt><b>ssl_connection</b>
+<dd>0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
+signed certs
+<dt><b>path</b>
+<dd>Websocket path on server
+<dt><b>host</b>
+<dd>Hostname on server
+<dt><b>origin</b>
+<dd>Socket origin name
+<dt><b>protocol</b>
+<dd>Comma-separated list of protocols being asked for from
+the server, or just one.  The server will pick the one it
+likes best.
+<dt><b>ietf_version_or_minus_one</b>
+<dd>-1 to ask to connect using the default, latest
+protocol supported, or the specific protocol ordinal
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function creates a connection to a remote server
+</blockquote>
+<hr>
+<h2>libwebsocket_client_connect_extended - Connect to another websocket server</h2>
+<i>struct libwebsocket *</i>
+<b>libwebsocket_client_connect_extended</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>const char *</i> <b>address</b>,
+<i>int</i> <b>port</b>,
+<i>int</i> <b>ssl_connection</b>,
+<i>const char *</i> <b>path</b>,
+<i>const char *</i> <b>host</b>,
+<i>const char *</i> <b>origin</b>,
+<i>const char *</i> <b>protocol</b>,
+<i>int</i> <b>ietf_version_or_minus_one</b>,
+<i>void *</i> <b>userdata</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websocket context
+<dt><b>address</b>
+<dd>Remote server address, eg, "myserver.com"
+<dt><b>port</b>
+<dd>Port to connect to on the remote server, eg, 80
+<dt><b>ssl_connection</b>
+<dd>0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
+signed certs
+<dt><b>path</b>
+<dd>Websocket path on server
+<dt><b>host</b>
+<dd>Hostname on server
+<dt><b>origin</b>
+<dd>Socket origin name
+<dt><b>protocol</b>
+<dd>Comma-separated list of protocols being asked for from
+the server, or just one.  The server will pick the one it
+likes best.
+<dt><b>ietf_version_or_minus_one</b>
+<dd>-1 to ask to connect using the default, latest
+protocol supported, or the specific protocol ordinal
+<dt><b>userdata</b>
+<dd>Pre-allocated user data
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function creates a connection to a remote server
+</blockquote>
+<hr>
+<h2>lws_get_library_version - </h2>
+<i>const char *</i>
+<b>lws_get_library_version</b>
+(<i></i> <b>void</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>void</b>
+<dd>no arguments
+</dl>
+<h3>Description</h3>
+<blockquote>
+<p>
+returns a const char * to a string like "1.1 178d78c"
+representing the library version followed by the git head hash it
+was built from
+</blockquote>
+<hr>
+<h2>libwebsockets_get_peer_addresses - Get client address information</h2>
+<i>void</i>
+<b>libwebsockets_get_peer_addresses</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>struct libwebsocket *</i> <b>wsi</b>,
+<i>int</i> <b>fd</b>,
+<i>char *</i> <b>name</b>,
+<i>int</i> <b>name_len</b>,
+<i>char *</i> <b>rip</b>,
+<i>int</i> <b>rip_len</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Libwebsockets context
+<dt><b>wsi</b>
+<dd>Local struct libwebsocket associated with
+<dt><b>fd</b>
+<dd>Connection socket descriptor
+<dt><b>name</b>
+<dd>Buffer to take client address name
+<dt><b>name_len</b>
+<dd>Length of client address name buffer
+<dt><b>rip</b>
+<dd>Buffer to take client address IP qotted quad
+<dt><b>rip_len</b>
+<dd>Length of client address IP buffer
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function fills in <tt><b>name</b></tt> and <tt><b>rip</b></tt> with the name and IP of
+the client connected with socket descriptor <tt><b>fd</b></tt>.  Names may be
+truncated if there is not enough room.  If either cannot be
+determined, they will be returned as valid zero-length strings.
+</blockquote>
+<hr>
+<h2>libwebsocket_service_fd - Service polled socket with something waiting</h2>
+<i>int</i>
+<b>libwebsocket_service_fd</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>struct pollfd *</i> <b>pollfd</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websocket context
+<dt><b>pollfd</b>
+<dd>The pollfd entry describing the socket fd and which events
+happened.
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function takes a pollfd that has POLLIN or POLLOUT activity and
+services it according to the state of the associated
+struct libwebsocket.
+<p>
+The one call deals with all "service" that might happen on a socket
+including listen accepts, http files as well as websocket protocol.
+</blockquote>
+<hr>
+<h2>libwebsocket_context_destroy - Destroy the websocket context</h2>
+<i>void</i>
+<b>libwebsocket_context_destroy</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websocket context
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function closes any active connections and then frees the
+context.  After calling this, any further use of the context is
+undefined.
+</blockquote>
+<hr>
+<h2>libwebsocket_context_user - get the user data associated with the context</h2>
+<i>LWS_EXTERN void *</i>
+<b>libwebsocket_context_user</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websocket context
+</dl>
+<h3>Description</h3>
+<blockquote>
+This returns the optional user allocation that can be attached to
+the context the sockets live in at context_create time.  It's a way
+to let all sockets serviced in the same context share data without
+using globals statics in the user code.
+</blockquote>
+<hr>
+<h2>libwebsocket_service - Service any pending websocket activity</h2>
+<i>int</i>
+<b>libwebsocket_service</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>int</i> <b>timeout_ms</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websocket context
+<dt><b>timeout_ms</b>
+<dd>Timeout for poll; 0 means return immediately if nothing needed
+service otherwise block and service immediately, returning
+after the timeout if nothing needed service.
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function deals with any pending websocket traffic, for three
+kinds of event.  It handles these events on both server and client
+types of connection the same.
+<p>
+1) Accept new connections to our context's server
+<p>
+2) Call the receive callback for incoming frame data received by
+server or client connections.
+<p>
+You need to call this service function periodically to all the above
+functions to happen; if your application is single-threaded you can
+just call it in your main event loop.
+<p>
+Alternatively you can fork a new process that asynchronously handles
+calling this service in a loop.  In that case you are happy if this
+call blocks your thread until it needs to take care of something and
+would call it with a large nonzero timeout.  Your loop then takes no
+CPU while there is nothing happening.
+<p>
+If you are calling it in a single-threaded app, you don't want it to
+wait around blocking other things in your loop from happening, so you
+would call it with a timeout_ms of 0, so it returns immediately if
+nothing is pending, or as soon as it services whatever was pending.
+</blockquote>
+<hr>
+<h2>libwebsocket_callback_on_writable - Request a callback when this socket becomes able to be written to without blocking</h2>
+<i>int</i>
+<b>libwebsocket_callback_on_writable</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>struct libwebsocket *</i> <b>wsi</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>libwebsockets context
+<dt><b>wsi</b>
+<dd>Websocket connection instance to get callback for
+</dl>
+<hr>
+<h2>libwebsocket_callback_on_writable_all_protocol - Request a callback for all connections using the given protocol when it becomes possible to write to each socket without blocking in turn.</h2>
+<i>int</i>
+<b>libwebsocket_callback_on_writable_all_protocol</b>
+(<i>const struct libwebsocket_protocols *</i> <b>protocol</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>protocol</b>
+<dd>Protocol whose connections will get callbacks
+</dl>
+<hr>
+<h2>libwebsocket_set_timeout - marks the wsi as subject to a timeout</h2>
+<i>void</i>
+<b>libwebsocket_set_timeout</b>
+(<i>struct libwebsocket *</i> <b>wsi</b>,
+<i>enum pending_timeout</i> <b>reason</b>,
+<i>int</i> <b>secs</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>wsi</b>
+<dd>Websocket connection instance
+<dt><b>reason</b>
+<dd>timeout reason
+<dt><b>secs</b>
+<dd>how many seconds
+</dl>
+<h3>Description</h3>
+<blockquote>
+<p>
+You will not need this unless you are doing something special
+</blockquote>
+<hr>
+<h2>libwebsocket_get_socket_fd - returns the socket file descriptor</h2>
+<i>int</i>
+<b>libwebsocket_get_socket_fd</b>
+(<i>struct libwebsocket *</i> <b>wsi</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>wsi</b>
+<dd>Websocket connection instance
+</dl>
+<h3>Description</h3>
+<blockquote>
+<p>
+You will not need this unless you are doing something special
+</blockquote>
+<hr>
+<h2>libwebsocket_rx_flow_control - Enable and disable socket servicing for receieved packets.</h2>
+<i>int</i>
+<b>libwebsocket_rx_flow_control</b>
+(<i>struct libwebsocket *</i> <b>wsi</b>,
+<i>int</i> <b>enable</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>wsi</b>
+<dd>Websocket connection instance to get callback for
+<dt><b>enable</b>
+<dd>0 = disable read servicing for this connection, 1 = enable
+</dl>
+<h3>Description</h3>
+<blockquote>
+<p>
+If the output side of a server process becomes choked, this allows flow
+control for the input side.
+</blockquote>
+<hr>
+<h2>libwebsocket_canonical_hostname - returns this host's hostname</h2>
+<i>const char *</i>
+<b>libwebsocket_canonical_hostname</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websocket context
+</dl>
+<h3>Description</h3>
+<blockquote>
+<p>
+This is typically used by client code to fill in the host parameter
+when making a client connection.  You can only call it after the context
+has been created.
+</blockquote>
+<hr>
+<h2>libwebsocket_create_context - Create the websocket handler</h2>
+<i>struct libwebsocket_context *</i>
+<b>libwebsocket_create_context</b>
+(<i>struct lws_context_creation_info *</i> <b>info</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>info</b>
+<dd>pointer to struct with parameters
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function creates the listening socket (if serving) and takes care
+of all initialization in one step.
+<p>
+After initialization, it returns a struct libwebsocket_context * that
+represents this server.  After calling, user code needs to take care
+of calling <b>libwebsocket_service</b> with the context pointer to get the
+server's sockets serviced.  This can be done in the same process context
+or a forked process, or another thread,
+<p>
+The protocol callback functions are called for a handful of events
+including http requests coming in, websocket connections becoming
+established, and data arriving; it's also called periodically to allow
+async transmission.
+<p>
+HTTP requests are sent always to the FIRST protocol in <tt><b>protocol</b></tt>, since
+at that time websocket protocol has not been negotiated.  Other
+protocols after the first one never see any HTTP callack activity.
+<p>
+The server created is a simple http server by default; part of the
+websocket standard is upgrading this http connection to a websocket one.
+<p>
+This allows the same server to provide files like scripts and favicon /
+images or whatever over http and dynamic data over websockets all in
+one place; they're all handled in the user callback.
+</blockquote>
+<hr>
+<h2>libwebsockets_get_protocol - Returns a protocol pointer from a websocket connection.</h2>
+<i>const struct libwebsocket_protocols *</i>
+<b>libwebsockets_get_protocol</b>
+(<i>struct libwebsocket *</i> <b>wsi</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>wsi</b>
+<dd>pointer to struct websocket you want to know the protocol of
+</dl>
+<h3>Description</h3>
+<blockquote>
+<p>
+Some apis can act on all live connections of a given protocol,
+this is how you can get a pointer to the active protocol if needed.
+</blockquote>
+<hr>
+<h2>lws_set_log_level - Set the logging bitfield</h2>
+<i>void</i>
+<b>lws_set_log_level</b>
+(<i>int</i> <b>level</b>,
+<i>void (*</i><b>log_emit_function</b>) <i>(int level,                                                               const char *line)</i>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>level</b>
+<dd>OR together the LLL_ debug contexts you want output from
+<dt><b>log_emit_function</b>
+<dd>NULL to leave it as it is, or a user-supplied
+function to perform log string emission instead of
+the default stderr one.
+</dl>
+<h3>Description</h3>
+<blockquote>
+log level defaults to "err", "warn" and "notice" contexts enabled and
+emission on stderr.
+</blockquote>
+<hr>
+<h2>libwebsocket_write - Apply protocol then write data to client</h2>
+<i>int</i>
+<b>libwebsocket_write</b>
+(<i>struct libwebsocket *</i> <b>wsi</b>,
+<i>unsigned char *</i> <b>buf</b>,
+<i>size_t</i> <b>len</b>,
+<i>enum libwebsocket_write_protocol</i> <b>protocol</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>wsi</b>
+<dd>Websocket instance (available from user callback)
+<dt><b>buf</b>
+<dd>The data to send.  For data being sent on a websocket
+connection (ie, not default http), this buffer MUST have
+LWS_SEND_BUFFER_PRE_PADDING bytes valid BEFORE the pointer
+and an additional LWS_SEND_BUFFER_POST_PADDING bytes valid
+in the buffer after (buf + len).  This is so the protocol
+header and trailer data can be added in-situ.
+<dt><b>len</b>
+<dd>Count of the data bytes in the payload starting from buf
+<dt><b>protocol</b>
+<dd>Use LWS_WRITE_HTTP to reply to an http connection, and one
+of LWS_WRITE_BINARY or LWS_WRITE_TEXT to send appropriate
+data on a websockets connection.  Remember to allow the extra
+bytes before and after buf if LWS_WRITE_BINARY or LWS_WRITE_TEXT
+are used.
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function provides the way to issue data back to the client
+for both http and websocket protocols.
+<p>
+In the case of sending using websocket protocol, be sure to allocate
+valid storage before and after buf as explained above.  This scheme
+allows maximum efficiency of sending data and protocol in a single
+packet while not burdening the user code with any protocol knowledge.
+<p>
+Return may be -1 for a fatal error needing connection close, or a
+positive number reflecting the amount of bytes actually sent.  This
+can be less than the requested number of bytes due to OS memory
+pressure at any given time.
+</blockquote>
+<hr>
+<h2>libwebsockets_serve_http_file - Send a file back to the client using http</h2>
+<i>int</i>
+<b>libwebsockets_serve_http_file</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>struct libwebsocket *</i> <b>wsi</b>,
+<i>const char *</i> <b>file</b>,
+<i>const char *</i> <b>content_type</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>libwebsockets context
+<dt><b>wsi</b>
+<dd>Websocket instance (available from user callback)
+<dt><b>file</b>
+<dd>The file to issue over http
+<dt><b>content_type</b>
+<dd>The http content type, eg, text/html
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function is intended to be called from the callback in response
+to http requests from the client.  It allows the callback to issue
+local files down the http link in a single step.
+<p>
+Returning &lt;0 indicates error and the wsi should be closed.  Returning
+&gt;0 indicates the file was completely sent and the wsi should be closed.
+==0 indicates the file transfer is started and needs more service later,
+the wsi should be left alone.
+</blockquote>
+<hr>
+<h2>lws_frame_is_binary - </h2>
+<i>int</i>
+<b>lws_frame_is_binary</b>
+(<i>struct libwebsocket *</i> <b>wsi</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>wsi</b>
+<dd>the connection we are inquiring about
+</dl>
+<h3>Description</h3>
+<blockquote>
+This is intended to be called from the LWS_CALLBACK_RECEIVE callback if
+it's interested to see if the frame it's dealing with was sent in binary
+mode.
+</blockquote>
+<hr>
+<h2>libwebsockets_remaining_packet_payload - Bytes to come before "overall" rx packet is complete</h2>
+<i>size_t</i>
+<b>libwebsockets_remaining_packet_payload</b>
+(<i>struct libwebsocket *</i> <b>wsi</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>wsi</b>
+<dd>Websocket instance (available from user callback)
+</dl>
+<h3>Description</h3>
+<blockquote>
+This function is intended to be called from the callback if the
+user code is interested in "complete packets" from the client.
+libwebsockets just passes through payload as it comes and issues a buffer
+additionally when it hits a built-in limit.  The LWS_CALLBACK_RECEIVE
+callback handler can use this API to find out if the buffer it has just
+been given is the last piece of a "complete packet" from the client --
+when that is the case <b>libwebsockets_remaining_packet_payload</b> will return
+0.
+<p>
+Many protocols won't care becuse their packets are always small.
+</blockquote>
+<hr>
+<h2>callback - User server actions</h2>
+<i>LWS_EXTERN int</i>
+<b>callback</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>struct libwebsocket *</i> <b>wsi</b>,
+<i>enum libwebsocket_callback_reasons</i> <b>reason</b>,
+<i>void *</i> <b>user</b>,
+<i>void *</i> <b>in</b>,
+<i>size_t</i> <b>len</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websockets context
+<dt><b>wsi</b>
+<dd>Opaque websocket instance pointer
+<dt><b>reason</b>
+<dd>The reason for the call
+<dt><b>user</b>
+<dd>Pointer to per-session user data allocated by library
+<dt><b>in</b>
+<dd>Pointer used for some callback reasons
+<dt><b>len</b>
+<dd>Length set for some callback reasons
+</dl>
+<h3>Description</h3>
+<blockquote>
+This callback is the way the user controls what is served.  All the
+protocol detail is hidden and handled by the library.
+<p>
+For each connection / session there is user data allocated that is
+pointed to by "user".  You set the size of this user data area when
+the library is initialized with libwebsocket_create_server.
+<p>
+You get an opportunity to initialize user data when called back with
+LWS_CALLBACK_ESTABLISHED reason.
+</blockquote>
+<h3>LWS_CALLBACK_ESTABLISHED</h3>
+<blockquote>
+after the server completes a handshake with
+an incoming client
+</blockquote>
+<h3>LWS_CALLBACK_CLIENT_CONNECTION_ERROR</h3>
+<blockquote>
+the request client connection has
+been unable to complete a handshake with the remote server
+</blockquote>
+<h3>LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH</h3>
+<blockquote>
+this is the last chance for the
+client user code to examine the http headers
+and decide to reject the connection.  If the
+content in the headers is interesting to the
+client (url, etc) it needs to copy it out at
+this point since it will be destroyed before
+the CLIENT_ESTABLISHED call
+</blockquote>
+<h3>LWS_CALLBACK_CLIENT_ESTABLISHED</h3>
+<blockquote>
+after your client connection completed
+a handshake with the remote server
+</blockquote>
+<h3>LWS_CALLBACK_CLOSED</h3>
+<blockquote>
+when the websocket session ends
+</blockquote>
+<h3>LWS_CALLBACK_RECEIVE</h3>
+<blockquote>
+data has appeared for this server endpoint from a
+remote client, it can be found at *in and is
+len bytes long
+</blockquote>
+<h3>LWS_CALLBACK_CLIENT_RECEIVE_PONG</h3>
+<blockquote>
+if you elected to see PONG packets,
+they appear with this callback reason.  PONG
+packets only exist in 04+ protocol
+</blockquote>
+<h3>LWS_CALLBACK_CLIENT_RECEIVE</h3>
+<blockquote>
+data has appeared from the server for the
+client connection, it can be found at *in and
+is len bytes long
+</blockquote>
+<h3>LWS_CALLBACK_HTTP</h3>
+<blockquote>
+an http request has come from a client that is not
+asking to upgrade the connection to a websocket
+one.  This is a chance to serve http content,
+for example, to send a script to the client
+which will then open the websockets connection.
+<tt><b>in</b></tt> points to the URI path requested and
+<b>libwebsockets_serve_http_file</b> makes it very
+simple to send back a file to the client.
+Normally after sending the file you are done
+with the http connection, since the rest of the
+activity will come by websockets from the script
+that was delivered by http, so you will want to
+return 1; to close and free up the connection.
+That's important because it uses a slot in the
+total number of client connections allowed set
+by MAX_CLIENTS.
+</blockquote>
+<h3>LWS_CALLBACK_HTTP_WRITEABLE</h3>
+<blockquote>
+you can write more down the http protocol
+link now.
+</blockquote>
+<h3>LWS_CALLBACK_HTTP_FILE_COMPLETION</h3>
+<blockquote>
+a file requested to be send down
+http link has completed.
+</blockquote>
+<h3>LWS_CALLBACK_SERVER_WRITEABLE</h3>
+<blockquote>
+If you call
+<b>libwebsocket_callback_on_writable</b> on a connection, you will
+get one of these callbacks coming when the connection socket
+is able to accept another write packet without blocking.
+If it already was able to take another packet without blocking,
+you'll get this callback at the next call to the service loop
+function.  Notice that CLIENTs get LWS_CALLBACK_CLIENT_WRITEABLE
+and servers get LWS_CALLBACK_SERVER_WRITEABLE.
+</blockquote>
+<h3>LWS_CALLBACK_FILTER_NETWORK_CONNECTION</h3>
+<blockquote>
+called when a client connects to
+the server at network level; the connection is accepted but then
+passed to this callback to decide whether to hang up immediately
+or not, based on the client IP.  <tt><b>in</b></tt> contains the connection
+socket's descriptor.  Return non-zero to terminate
+the connection before sending or receiving anything.
+Because this happens immediately after the network connection
+from the client, there's no websocket protocol selected yet so
+this callback is issued only to protocol 0.
+</blockquote>
+<h3>LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION</h3>
+<blockquote>
+called when the handshake has
+been received and parsed from the client, but the response is
+not sent yet.  Return non-zero to disallow the connection.
+<tt><b>user</b></tt> is a pointer to an array of struct lws_tokens, you can
+use the header enums lws_token_indexes from libwebsockets.h
+to check for and read the supported header presence and
+content before deciding to allow the handshake to proceed or
+to kill the connection.
+</blockquote>
+<h3>LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS</h3>
+<blockquote>
+if configured for
+including OpenSSL support, this callback allows your user code
+to perform extra <b>SSL_CTX_load_verify_locations</b> or similar
+calls to direct OpenSSL where to find certificates the client
+can use to confirm the remote server identity.  <tt><b>user</b></tt> is the
+OpenSSL SSL_CTX*
+</blockquote>
+<h3>LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS</h3>
+<blockquote>
+if configured for
+including OpenSSL support, this callback allows your user code
+to load extra certifcates into the server which allow it to
+verify the validity of certificates returned by clients.  <tt><b>user</b></tt>
+is the server's OpenSSL SSL_CTX*
+</blockquote>
+<h3>LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION</h3>
+<blockquote>
+if the
+libwebsockets context was created with the option
+LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT, then this
+callback is generated during OpenSSL verification of the cert
+sent from the client.  It is sent to protocol[0] callback as
+no protocol has been negotiated on the connection yet.
+Notice that the libwebsockets context and wsi are both NULL
+during this callback.  See
+</blockquote>
+<h3>http</h3>
+<blockquote>
+//www.openssl.org/docs/ssl/SSL_CTX_set_verify.html
+to understand more detail about the OpenSSL callback that
+generates this libwebsockets callback and the meanings of the
+arguments passed.  In this callback, <tt><b>user</b></tt> is the x509_ctx,
+<tt><b>in</b></tt> is the ssl pointer and <tt><b>len</b></tt> is preverify_ok
+Notice that this callback maintains libwebsocket return
+conventions, return 0 to mean the cert is OK or 1 to fail it.
+This also means that if you don't handle this callback then
+the default callback action of returning 0 allows the client
+certificates.
+</blockquote>
+<h3>LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER</h3>
+<blockquote>
+this callback happens
+when a client handshake is being compiled.  <tt><b>user</b></tt> is NULL,
+<tt><b>in</b></tt> is a char **, it's pointing to a char * which holds the
+next location in the header buffer where you can add
+headers, and <tt><b>len</b></tt> is the remaining space in the header buffer,
+which is typically some hundreds of bytes.  So, to add a canned
+cookie, your handler code might look similar to:
+<p>
+char **p = (char **)in;
+<p>
+if (len &lt; 100)
+return 1;
+<p>
+*p += sprintf(*p, "Cookie: a=b\x0d\x0a");
+<p>
+return 0;
+<p>
+Notice if you add anything, you just have to take care about
+the CRLF on the line you added.  Obviously this callback is
+optional, if you don't handle it everything is fine.
+<p>
+Notice the callback is coming to protocols[0] all the time,
+because there is no specific protocol handshook yet.
+</blockquote>
+<h3>LWS_CALLBACK_CONFIRM_EXTENSION_OKAY</h3>
+<blockquote>
+When the server handshake code
+sees that it does support a requested extension, before
+accepting the extension by additing to the list sent back to
+the client it gives this callback just to check that it's okay
+to use that extension.  It calls back to the requested protocol
+and with <tt><b>in</b></tt> being the extension name, <tt><b>len</b></tt> is 0 and <tt><b>user</b></tt> is
+valid.  Note though at this time the ESTABLISHED callback hasn't
+happened yet so if you initialize <tt><b>user</b></tt> content there, <tt><b>user</b></tt>
+content during this callback might not be useful for anything.
+Notice this callback comes to protocols[0].
+</blockquote>
+<h3>LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED</h3>
+<blockquote>
+When a client
+connection is being prepared to start a handshake to a server,
+each supported extension is checked with protocols[0] callback
+with this reason, giving the user code a chance to suppress the
+claim to support that extension by returning non-zero.  If
+unhandled, by default 0 will be returned and the extension
+support included in the header to the server.  Notice this
+callback comes to protocols[0].
+</blockquote>
+<h3>LWS_CALLBACK_PROTOCOL_INIT</h3>
+<blockquote>
+One-time call per protocol so it can
+do initial setup / allocations etc
+</blockquote>
+<h3>LWS_CALLBACK_PROTOCOL_DESTROY</h3>
+<blockquote>
+One-time call per protocol indicating
+this protocol won't get used at all after this callback, the
+context is getting destroyed.  Take the opportunity to
+deallocate everything that was allocated by the protocol.
+<p>
+The next four reasons are optional and only need taking care of if you
+will be integrating libwebsockets sockets into an external polling
+array.
+</blockquote>
+<h3>LWS_CALLBACK_ADD_POLL_FD</h3>
+<blockquote>
+libwebsocket deals with its <b>poll</b> loop
+internally, but in the case you are integrating with another
+server you will need to have libwebsocket sockets share a
+polling array with the other server.  This and the other
+POLL_FD related callbacks let you put your specialized
+poll array interface code in the callback for protocol 0, the
+first protocol you support, usually the HTTP protocol in the
+serving case.  This callback happens when a socket needs to be
+</blockquote>
+<h3>added to the polling loop</h3>
+<blockquote>
+<tt><b>in</b></tt> contains the fd, and
+<tt><b>len</b></tt> is the events bitmap (like, POLLIN).  If you are using the
+internal polling loop (the "service" callback), you can just
+ignore these callbacks.
+</blockquote>
+<h3>LWS_CALLBACK_DEL_POLL_FD</h3>
+<blockquote>
+This callback happens when a socket descriptor
+needs to be removed from an external polling array.  <tt><b>in</b></tt> is
+the socket desricptor.  If you are using the internal polling
+loop, you can just ignore it.
+</blockquote>
+<h3>LWS_CALLBACK_SET_MODE_POLL_FD</h3>
+<blockquote>
+This callback happens when libwebsockets
+wants to modify the events for the socket descriptor in <tt><b>in</b></tt>.
+The handler should OR <tt><b>len</b></tt> on to the events member of the pollfd
+struct for this socket descriptor.  If you are using the
+internal polling loop, you can just ignore it.
+</blockquote>
+<h3>LWS_CALLBACK_CLEAR_MODE_POLL_FD</h3>
+<blockquote>
+This callback occurs when libwebsockets
+wants to modify the events for the socket descriptor in <tt><b>in</b></tt>.
+The handler should AND ~<tt><b>len</b></tt> on to the events member of the
+pollfd struct for this socket descriptor.  If you are using the
+internal polling loop, you can just ignore it.
+</blockquote>
+<hr>
+<h2>extension_callback - Hooks to allow extensions to operate</h2>
+<i>LWS_EXTERN int</i>
+<b>extension_callback</b>
+(<i>struct libwebsocket_context *</i> <b>context</b>,
+<i>struct libwebsocket_extension *</i> <b>ext</b>,
+<i>struct libwebsocket *</i> <b>wsi</b>,
+<i>enum libwebsocket_extension_callback_reasons</i> <b>reason</b>,
+<i>void *</i> <b>user</b>,
+<i>void *</i> <b>in</b>,
+<i>size_t</i> <b>len</b>)
+<h3>Arguments</h3>
+<dl>
+<dt><b>context</b>
+<dd>Websockets context
+<dt><b>ext</b>
+<dd>This extension
+<dt><b>wsi</b>
+<dd>Opaque websocket instance pointer
+<dt><b>reason</b>
+<dd>The reason for the call
+<dt><b>user</b>
+<dd>Pointer to per-session user data allocated by library
+<dt><b>in</b>
+<dd>Pointer used for some callback reasons
+<dt><b>len</b>
+<dd>Length set for some callback reasons
+</dl>
+<h3>Description</h3>
+<blockquote>
+Each extension that is active on a particular connection receives
+callbacks during the connection lifetime to allow the extension to
+operate on websocket data and manage itself.
+<p>
+Libwebsockets takes care of allocating and freeing "user" memory for
+each active extension on each connection.  That is what is pointed to
+by the <tt><b>user</b></tt> parameter.
+</blockquote>
+<h3>LWS_EXT_CALLBACK_CONSTRUCT</h3>
+<blockquote>
+called when the server has decided to
+select this extension from the list provided by the client,
+just before the server will send back the handshake accepting
+the connection with this extension active.  This gives the
+extension a chance to initialize its connection context found
+in <tt><b>user</b></tt>.
+</blockquote>
+<h3>LWS_EXT_CALLBACK_CLIENT_CONSTRUCT</h3>
+<blockquote>
+same as LWS_EXT_CALLBACK_CONSTRUCT
+but called when client is instantiating this extension.  Some
+extensions will work the same on client and server side and then
+you can just merge handlers for both CONSTRUCTS.
+</blockquote>
+<h3>LWS_EXT_CALLBACK_DESTROY</h3>
+<blockquote>
+called when the connection the extension was
+being used on is about to be closed and deallocated.  It's the
+last chance for the extension to deallocate anything it has
+allocated in the user data (pointed to by <tt><b>user</b></tt>) before the
+user data is deleted.  This same callback is used whether you
+are in client or server instantiation context.
+</blockquote>
+<h3>LWS_EXT_CALLBACK_PACKET_RX_PREPARSE</h3>
+<blockquote>
+when this extension was active on
+a connection, and a packet of data arrived at the connection,
+it is passed to this callback to give the extension a chance to
+change the data, eg, decompress it.  <tt><b>user</b></tt> is pointing to the
+extension's private connection context data, <tt><b>in</b></tt> is pointing
+to an lws_tokens struct, it consists of a char * pointer called
+token, and an int called token_len.  At entry, these are
+set to point to the received buffer and set to the content
+length.  If the extension will grow the content, it should use
+a new buffer allocated in its private user context data and
+set the pointed-to lws_tokens members to point to its buffer.
+</blockquote>
+<h3>LWS_EXT_CALLBACK_PACKET_TX_PRESEND</h3>
+<blockquote>
+this works the same way as
+LWS_EXT_CALLBACK_PACKET_RX_PREPARSE above, except it gives the
+extension a chance to change websocket data just before it will
+be sent out.  Using the same lws_token pointer scheme in <tt><b>in</b></tt>,
+the extension can change the buffer and the length to be
+transmitted how it likes.  Again if it wants to grow the
+buffer safely, it should copy the data into its own buffer and
+set the lws_tokens token pointer to it.
+</blockquote>
+<hr>
+<h2>struct libwebsocket_protocols - List of protocols and handlers server supports.</h2>
+<b>struct libwebsocket_protocols</b> {<br>
+&nbsp; &nbsp; <i>const char *</i> <b>name</b>;<br>
+&nbsp; &nbsp; <i>callback_function *</i> <b>callback</b>;<br>
+&nbsp; &nbsp; <i>size_t</i> <b>per_session_data_size</b>;<br>
+&nbsp; &nbsp; <i>size_t</i> <b>rx_buffer_size</b>;<br>
+&nbsp; &nbsp; <i>struct libwebsocket_context *</i> <b>owning_server</b>;<br>
+&nbsp; &nbsp; <i>int</i> <b>protocol_index</b>;<br>
+};<br>
+<h3>Members</h3>
+<dl>
+<dt><b>name</b>
+<dd>Protocol name that must match the one given in the client
+Javascript new WebSocket(url, 'protocol') name
+<dt><b>callback</b>
+<dd>The service callback used for this protocol.  It allows the
+service action for an entire protocol to be encapsulated in
+the protocol-specific callback
+<dt><b>per_session_data_size</b>
+<dd>Each new connection using this protocol gets
+this much memory allocated on connection establishment and
+freed on connection takedown.  A pointer to this per-connection
+allocation is passed into the callback in the 'user' parameter
+<dt><b>rx_buffer_size</b>
+<dd>if you want atomic frames delivered to the callback, you
+should set this to the size of the biggest legal frame that
+you support.  If the frame size is exceeded, there is no
+error, but the buffer will spill to the user callback when
+full, which you can detect by using
+<b>libwebsockets_remaining_packet_payload</b>.  Notice that you
+just talk about frame size here, the LWS_SEND_BUFFER_PRE_PADDING
+and post-padding are automatically also allocated on top.
+<dt><b>owning_server</b>
+<dd>the server init call fills in this opaque pointer when
+registering this protocol with the server.
+<dt><b>protocol_index</b>
+<dd>which protocol we are starting from zero
+</dl>
+<h3>Description</h3>
+<blockquote>
+This structure represents one protocol supported by the server.  An
+array of these structures is passed to <b>libwebsocket_create_server</b>
+allows as many protocols as you like to be handled by one server.
+</blockquote>
+<hr>
+<h2>struct libwebsocket_extension - An extension we know how to cope with</h2>
+<b>struct libwebsocket_extension</b> {<br>
+&nbsp; &nbsp; <i>const char *</i> <b>name</b>;<br>
+&nbsp; &nbsp; <i>extension_callback_function *</i> <b>callback</b>;<br>
+&nbsp; &nbsp; <i>size_t</i> <b>per_session_data_size</b>;<br>
+&nbsp; &nbsp; <i>void *</i> <b>per_context_private_data</b>;<br>
+};<br>
+<h3>Members</h3>
+<dl>
+<dt><b>name</b>
+<dd>Formal extension name, eg, "deflate-stream"
+<dt><b>callback</b>
+<dd>Service callback
+<dt><b>per_session_data_size</b>
+<dd>Libwebsockets will auto-malloc this much
+memory for the use of the extension, a pointer
+to it comes in the <tt><b>user</b></tt> callback parameter
+<dt><b>per_context_private_data</b>
+<dd>Optional storage for this extension that
+is per-context, so it can track stuff across
+all sessions, etc, if it wants
+</dl>
+<hr>
+<h2>struct lws_context_creation_info - </h2>
+<b>struct lws_context_creation_info</b> {<br>
+&nbsp; &nbsp; <i>int</i> <b>port</b>;<br>
+&nbsp; &nbsp; <i>const char *</i> <b>iface</b>;<br>
+&nbsp; &nbsp; <i>struct libwebsocket_protocols *</i> <b>protocols</b>;<br>
+&nbsp; &nbsp; <i>struct libwebsocket_extension *</i> <b>extensions</b>;<br>
+&nbsp; &nbsp; <i>const char *</i> <b>ssl_cert_filepath</b>;<br>
+&nbsp; &nbsp; <i>const char *</i> <b>ssl_private_key_filepath</b>;<br>
+&nbsp; &nbsp; <i>const char *</i> <b>ssl_ca_filepath</b>;<br>
+&nbsp; &nbsp; <i>const char *</i> <b>ssl_cipher_list</b>;<br>
+&nbsp; &nbsp; <i>int</i> <b>gid</b>;<br>
+&nbsp; &nbsp; <i>int</i> <b>uid</b>;<br>
+&nbsp; &nbsp; <i>unsigned int</i> <b>options</b>;<br>
+&nbsp; &nbsp; <i>void *</i> <b>user</b>;<br>
+&nbsp; &nbsp; <i>int</i> <b>ka_time</b>;<br>
+&nbsp; &nbsp; <i>int</i> <b>ka_probes</b>;<br>
+&nbsp; &nbsp; <i>int</i> <b>ka_interval</b>;<br>
+};<br>
+<h3>Members</h3>
+<dl>
+<dt><b>port</b>
+<dd>Port to listen on... you can use 0 to suppress listening on
+any port, that's what you want if you are not running a
+websocket server at all but just using it as a client
+<dt><b>iface</b>
+<dd>NULL to bind the listen socket to all interfaces, or the
+interface name, eg, "eth2"
+<dt><b>protocols</b>
+<dd>Array of structures listing supported protocols and a protocol-
+specific callback for each one.  The list is ended with an
+entry that has a NULL callback pointer.
+It's not const because we write the owning_server member
+<dt><b>extensions</b>
+<dd>NULL or array of libwebsocket_extension structs listing the
+extensions this context supports.  If you configured with
+--without-extensions, you should give NULL here.
+<dt><b>ssl_cert_filepath</b>
+<dd>If libwebsockets was compiled to use ssl, and you want
+to listen using SSL, set to the filepath to fetch the
+server cert from, otherwise NULL for unencrypted
+<dt><b>ssl_private_key_filepath</b>
+<dd>filepath to private key if wanting SSL mode,
+else ignored
+<dt><b>ssl_ca_filepath</b>
+<dd>CA certificate filepath or NULL
+<dt><b>ssl_cipher_list</b>
+<dd>List of valid ciphers to use (eg,
+"RC4-MD5:RC4-SHA:AES128-SHA:AES256-SHA:HIGH:!DSS:!aNULL"
+or you can leave it as NULL to get "DEFAULT"
+<dt><b>gid</b>
+<dd>group id to change to after setting listen socket, or -1.
+<dt><b>uid</b>
+<dd>user id to change to after setting listen socket, or -1.
+<dt><b>options</b>
+<dd>0, or LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK
+<dt><b>user</b>
+<dd>optional user pointer that can be recovered via the context
+pointer using libwebsocket_context_user
+<dt><b>ka_time</b>
+<dd>0 for no keepalive, otherwise apply this keepalive timeout to
+all libwebsocket sockets, client or server
+<dt><b>ka_probes</b>
+<dd>if ka_time was nonzero, after the timeout expires how many
+times to try to get a response from the peer before giving up
+and killing the connection
+<dt><b>ka_interval</b>
+<dd>if ka_time was nonzero, how long to wait before each ka_probes
+attempt
+</dl>
+<hr>
diff --git a/libwebsockets.manifest b/libwebsockets.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/libwebsockets.pc.in b/libwebsockets.pc.in
new file mode 100644 (file)
index 0000000..4fadd72
--- /dev/null
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libwebsockets
+Description: Websockets server and client library
+Version: @VERSION@
+
+Libs: -L${libdir} -lwebsockets
+Cflags: -I${includedir}
diff --git a/libwebsockets.spec b/libwebsockets.spec
new file mode 100644 (file)
index 0000000..81d119c
--- /dev/null
@@ -0,0 +1,66 @@
+Name: libwebsockets
+Version: 1.2
+Release: 46.gmaster_f59d56cbd8305ed%{?dist}
+Summary: Websocket Server Library
+
+Group: System
+License: GPL
+URL: http://warmcat.com
+Source0: %{name}-%{version}.tar.gz
+BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: openssl-devel
+Requires: openssl-devel
+
+%description
+Webserver server library
+
+%package devel
+Summary: Development files for libwebsockets
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: openssl-devel
+
+%description devel
+Development files for libwebsockets
+
+%prep
+%setup -q
+
+%build
+./configure --prefix=/usr --libdir=%{_libdir} --enable-openssl
+make
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%attr(755,root,root) /usr/bin/libwebsockets-test-server
+%attr(755,root,root) /usr/bin/libwebsockets-test-server-extpoll
+%attr(755,root,root) /usr/bin/libwebsockets-test-client
+%attr(755,root,root) /usr/bin/libwebsockets-test-ping
+%attr(755,root,root) /usr/bin/libwebsockets-test-echo
+%attr(755,root,root) /usr/bin/libwebsockets-test-fraggle
+%attr(755,root,root) 
+/%{_libdir}/libwebsockets.so.3.0.0
+/%{_libdir}/libwebsockets.so.3
+/%{_libdir}/libwebsockets.so
+/%{_libdir}/libwebsockets.la
+%attr(755,root,root) /usr/share/libwebsockets-test-server
+%doc
+%files devel
+%defattr(-,root,root,-)
+/usr/include/*
+%attr(755,root,root)
+/%{_libdir}/libwebsockets.a
+/%{_libdir}/pkgconfig/libwebsockets.pc
+
+%changelog
+
diff --git a/m4/ignore-me b/m4/ignore-me
new file mode 100644 (file)
index 0000000..139597f
--- /dev/null
@@ -0,0 +1,2 @@
+
+
diff --git a/packaging/libwebsockets.changes b/packaging/libwebsockets.changes
new file mode 100644 (file)
index 0000000..d686fdd
--- /dev/null
@@ -0,0 +1,364 @@
+* Tue Oct 16 2013 <kevron.m.rees@intel.com>
+- added .gbs.conf file
+
+* Tue Jun 18 2013 tripzero <kevron_m_rees@linux.intel.com> accepted/2.0/20130313.182558@25cd862
+- sumbitting to tizen
+
+* Mon Jun 03 2013 tripzero <kevron_m_rees@linux.intel.com> accepted/2.0/20130313.182558@8a05fa0
+- Switching to cmake based builds
+- updated chlog
+
+* Thu Mar 07 2013 tripzero <kevron_m_rees@linux.intel.com> submit/2.0/20130307.212405@44857b2
+- Merge branch '2.0' of tizen:profile/ivi/libwebsockets into 2.0
+- pkgconfig install
+- updated spec fixed pkgconfig
+- updated spec enabled ssl
+- updated spec
+- updated spec
+- fix win32helpers gettimeofday epoch
+- trace 22 fix zero length close from client
+- cmake mingw no need for websock w32
+- normalize formatting in gettimeofday
+- fix win32 gettimeofday for mingw
+- cmake lib lib64 problem
+- fix mime type on leaf header
+- reflect send completeness in lws_write return
+- move ssl cipher list from compiletime to context creation time option
+- remove MAX_HEADER_NAME_LENGTH from header
+- Fix running test programs from within visual studio.
+- Print SSL error codes as well as the string.
+- Set the _DEBUG macro for CMake also.
+- Fixed ssl cert generation on Windows.
+- Added CPack support + some more.
+- BUGFIX: Fixed bug for installing test-apps for CMake.
+- Fixed CMake compile options.
+- getifaddrs missing more user friendly in CMake.
+- Fix LWS_NO_SERVER build.
+- Bugfix compiling for cross compiling.
+- keepalive swap interval and probes
+- provide socketfd at in param for LWS_CALLBACK_FILTER_NETWORK_CONNECTION
+- trac 18 deal with service connection timing out
+- cmake fix for older cmake
+- update missed extpoll calls to use correct args for ssl
+- cmake docs add note about prefix
+- Create the "doc" dir before generating docs.
+- Added "make install" support to the CMake project.
+- trac 17 update set_log_level api notice
+- move cms cmake addition to cmake module paths earlier
+- add FindGit.cmake
+- document ensure_user_space going private
+- remove lws_ensure_user_space from public api change return
+- update arm build stats
+- trim proxy ads plus hostname stg
+- restrict http send buffer to 4096
+- fix no extensions build
+- migrate client hs and c_port into ah
+- minor type optimizations
+- remove current_alloc_len
+- remove header name buffer
+- handle http union transition properly
+- test server kill skt with minus 1
+- handle any POLLIN before error
+- close if we tried to close politely just close next time
+- api change deliver socket fd to in param of extpoll callbacks
+- problems in lws_handle_POLLOUT_event should just close
+- robustness protect and document ensure_user_space
+- README.coding add note about closing connections
+- add by hand http send example
+- create user alloc for http if requested
+- introduce LWS_CALLBACK_HTTP_WRITEABLE
+- just get hostname into canonical_hostname
+- fragge able to send chunks larger than rx buffer
+- unstaged server changes
+- update 1.21 changelog
+- check for default protocol rx buf limit
+- update changelog
+- fix missing cr from closing log
+- update echo to use externsion getting api
+- Fixed DLL compilation on Windows for CMake.
+- Fixed soname and build shared lib for CMake.
+- Added so-version information to the lib.
+- disable fstack usage
+- echo test app needs different lockfile
+- update rpm specfile
+- introduce attack script
+- security disallow repeated GET
+- security harden http parser a bit
+- fix another escaape runon
+- add cyassl keepalive valgrind minimal mem to changelog
+- bump version to 1.2 and soname to 3
+- api make close api private only
+- api remove hangup_on_client
+- update test echo for iface info member namechange
+- eliminate snprintf
+- fix info struct api docs for iface vs interface
+- Fixed compilation on Windows.
+- update memory performance info
+- fix ssl reject path for freeing header allocation
+- fix busted debug format in ssl mode
+- fix string escape runon
+- fix without server
+- style cleanup
+- valgrind openssl destroy as far as possible
+- valgrind client close in a controlled way on SIGINT
+- valgrind eliminate uninitialized warning on close
+- valgrind also deallocate rx buf on close when client
+- valgrind dont close things directly in the callback
+- valgrind client go through context destroy on connection error
+- client convert to new headers scheme eliminating mallocs
+- valgrind free rx_user_buffer if entered CONNMODE_WS_SERVING
+- valgrind introduce protocol init and destroy user callbacks
+- valgrind context destroy close all conns properly
+- valgrind drop header allocation down http path
+- replace per header mallocs with single malloc 3 level struct
+- improve static allocation notice
+- valgrind free context allocations
+- remove extension cruft from struct lws
+- use part of service buffer to make response not malloc
+- remove minimum frame size for deflate
+- stop O2 override
+- dont close in user callback wrapper let ancestor do it
+- fix error path in file transfer
+- throw out lws_websocket_related cruft
+- optimize wsi using bitfields and enums to chars
+- use context service buffer instead of stack for clent_connect
+- use context service buffer instead of stack for clent_connect_2
+- use context service buffer instead of stack for create_context
+- fix non ssl changes missed from context api change
+- use context service buffer instead of stack for lws_client_socket_service
+- use context service buffer instead of stack for server_socket_service
+- add static stack analysis
+- dont try figure out listen_service_fd position if unset
+- dont try set per socket keepalive timing on bsds
+- fix broken listen socket piggybacking
+- introduce keepalive option and make common socket options function
+- remove receiving timeout for client
+- correct test client to close synchronously with last send
+- align max frame for mirror protocol to what the code does
+- change context creation params to struct
+- handshake bail3 should be bail
+- remove fixed rx buffer allow definition per protocol
+- account for context in static allocation figure
+- remove all PATH_MAX or MAX_PATH
+- use context service buf in place of large stack arrays
+- remove need for filepath buffer on http file serve
+- add static linking exception to LICENSE
+- add unchanged lgpl 2.1 in LICENSE
+- Fix memory leaks when creating a context.
+- Generate the API reference in text format, too.
+- Fix two typos.
+- changelog header lifecycle
+- add autotools bits for cyassl
+- unionize header token array
+- document header lifecycle change
+- headers deleted after websocket established
+- leverage TOKEN_SKIPPING better in parser
+- simplify parsing complete
+- act on fatal parse problems
+- remove deprecated vcxproj
+- update changelog about cmake
+- Added build instructions for CMake.
+- add README
+- Fixed compilation on NetBSD.
+- Cleaned up the CyaSSL linking in the CMake project a bit.
+- Fixed windows build.
+- Added some minor changes to CMake build file.
+- Added support for CyaSSL replacement of OpenSSL.
+- Added check for inline keyword availability.
+- Fixed build on OSX.
+- Fixed linux compilation and added more compile options.
+- CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far).   - Uses a generated lws_config.h that is included in   private-libwebsocket to pass defines, only used if CMAKE_BUILD is set.   - Support for SSL on Windows.   - Initial support for CyaSSL replacement of OpenSSL (This has been added     to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio   Project. (Not to keen fixing all the others when we have CMake support   anyway (which can generate much better project files)...) - BUGFIXES:   - handshake.c     - used C99 definition of handshake_0405 function   - libwebsocket.c     - syslog not available on windows, put in ifdefs.     - Fixed previous known crash bug on Windows where WSAPoll in       Ws2_32.dll would not be present, causing the poll function pointer       being set to NULL.     - Uninitialized variable context->listen_service_extraseen would       result in stack overflow because of infinite recursion. Fixed by       initializing in libwebsocket_create_context     - SO_REUSADDR means something different on Windows compared to Unix.     - Setting a socket to nonblocking is done differently on Windows.       (This should probably broken out into a helper function instead)     - lwsl_emit_syslog -> lwsl_emit_stderr on Windows.   - private-libwebsocket.h     - PATH_MAX is not available on Windows, define as MAX_PATH     - Always define LWS_NO_DAEMONIZE on windows.     - Don't define lws_latency as inline that does nothing. inline is not       support by the Microsoft compiler, replaced with an empty define       instead. (It's __inline in MSVC)   - server.c     - Fixed nonblock call on windows   - test-ping.c     - Don't use C99 features (Microsoft compiler does not support it).     - Move non-win32 headers into ifdefs.     - Skip use of sighandler on Windows.   - test-server.c     - ifdef syslog parts on Windows.
+- Some more Cmake stuff.
+- Started redoing CMake support based on the up to date repos
+- improve test server poll loop docs
+- add note about MIPS opewrt configure options
+- remove one more mention of broadcast callback
+- introduce library version plus git hash
+- remove stray reference to max broadcast size from readme.build
+- additional casts allow test server build as cpp
+- update changelog tag chrome 26 firefox 18
+- renovate test html
+- add changelog v1.0 to v1.1
+- bump version to 1.1 and soname to 2
+- clean out remaining mentions of deprecated broadcast
+- get error from getnameinfo if unable to improve hostname and use hostname
+- fixes for without server and without client
+- fix unused var if no enable openssl
+- introduce test echo
+- add info about why we close to more places
+- roubustness handle problems in read loop better
+- server allow NULL protocol map to protocol 0
+- change get_peer_addresses to use context wsi latency
+- instrument latency
+- introduce lws_latency
+- fix docs about protocol version supported
+- test server terminate cleanly on ctrl c
+- evict all broadcast support
+- FreeBSD compatibility
+- trac 6 expose libwebsockets read with note about not normally needed
+- fix ssl bits outside of ifdef coverage
+- force client ssl bio nonblocking
+- force ssl rw bios nonblocking
+- timeout coverage for ssl accept
+- break up ssl accept action
+- ensure accept is nonblocking
+- autocreate foreign broadcast sockets on broadcast
+- trac 5 sa_restorer deprecated
+- trac 3 document write and context_user
+- trac 4 correct libebsocket_service_fd
+- update numbers for minimal build footprint
+- more LWS_NO_DAEMONIZE
+- use correct LWS_NO_DAEMONIZE on test server
+- bind gcc debug generation to_DEBUG
+- unionize mutually exclusive wsi members
+- key_b64 doesnt need to be in wsi
+- avoid PATH_MAX in bss in daemonize
+- remove all support for pre v13 protocols
+- disable private broadcast sockets if enable no fork config option
+- align test server extpoll with library dynamic approach
+- document memory efficiency
+- log major dynamic allocation info
+- zlib not needed if no extensions
+- introduce without extensions
+- refactor README
+- syslog requires format string
+- revert zlib update 1.2.7
+- make use of lock file
+- windows compatibility changes for private libwebsockets
+- test server add daemonization flag
+- test server use syslog logging
+- allow_use_of_lwsl_logging in user code
+- helper api:  log through syslog
+- logging select some lwsl_info usage to be lwsl_notice
+- add lwsl_notice
+- expose log level in emit
+- change bitfield setting to avoid gcc warnings
+- improve frame_is_binary setting
+- add lws_confirm_legit_wsi
+- refactor and introduce without server configure option
+- introdice tracking if frame is binary
+- different compiler warning fixes
+- add lexical parser for headers
+- deprecate x google mux
+- solve flowcontrol problems
+- check errors on shutdown close
+- replace hashtable polltable management
+- use simple lookup table for extpoll
+- include daemonization file whoops
+- portability dont assume size of tv.t_usec
+- add disable debug to README configuration options list
+- including assert h needed on osx
+- just use limits.h directly
+- introduce daemonize
+- client allow remote server to accept with no protocol set
+- move array bounds gcc workaround outside function
+- update ping test client and stop exposing payload to extensions
+- export lswl_hexdump
+- roubustness only return 0 from fd service if handled
+- configure without client
+- test client remove usleep
+- refactor output.c
+- refactor migrate client stuff to client.c
+- add new context arg to libwebsockets_serve_http_file
+- robustness server dont exit server on accept problems
+- workaround for some gcc array bounds false positive
+- add logo to test file
+- update test server html serving callback to use aepd whitelist approach
+- add libwebsockets.org logo to share
+- optimize http file sending
+- listen socket more frequent service
+- add empty m4 dir as workaround for autoreconf issue
+- allow LWS_SOMAXCONN to be defined at configuretime
+- extpoll use hashtable for fd tracking
+- allow building just the library not the testapps
+- make sure we have PATH_MAX on some linux toolchains (AG modified a bit)
+- extpoll break out of loop when set or clear finds fd
+- http service break into outer loop states
+- merge test server extpoll into test server
+- optimize extpoll fd delete
+- deal with SSL_ERROR_WANT_ in client connect action
+- add longlived option to test client
+- logging ensure everyone has a newline
+- replace ifdefs around close socket with compatible_close
+- ssl client certs fix crash
+- absorb README.rst into main README and code
+- expose compiletime constants to setting from configure
+- renable deflate frame buffer expansion fixing DoS
+- fix config enable name for getifaddrs
+- introduce getifaddrs for toolchains without it
+- audit and make all malloc check for OOM
+- logging add timestamp
+- logging extend level set api to allow setting emission function
+- update README with info on new logging scheme
+- allow enabling debug contexts from test apps
+- introduce logging api and convert all library output to use it
+- compile in xcode, privatize debug macro
+- update soname and configure to v1.0
+- correct autotools warning
+- zlib code add OOM checks remove buffer expansion on rx path
+- Avoid leaking a socket when SSL_accept fails.
+- Print error string on accept failure.
+- Increased MAX_BROADCAST_PAYLOAD to match MAX_USER_RX_BUFFER.
+- Added README file with some useful tips for using the library.
+- Added support for continuation frames on the server.
+- Close connection if LWS_CALLBACK_HTTP returns non-zero.
+- Fixed to keep reading data until the SSL internal buffer is empty. Before this fix only 2048 bytes were read, the rest were buffered inside SSL until another message arrived!!!
+- Added no-cache headers to client handshake: http://www.ietf.org/mail-archive/web/hybi/current/msg09841.html
+- Separate compression levels for server and client, increased the later one to zlib default (6).
+- More correct handling of inflate result.
+- Fixed crash when HTTP requests method is not GET.
+- Check if macro SSL_OP_NO_COMPRESSION is defined before trying to use it.
+- Using size_t instead of int for deflate-frame offsets and length.
+- Added private macro CIPHERS_LIST_STRING to define ciphers list string.
+- When choosing a cipher, use the server's preferences.
+- Pass URI length to LWS_CALLBACK_HTTP.
+- Disable compression for SSL socket, it is a waste of CPU when using compression extensions.
+- Using "SSL_CTX_use_certificate_chain_file" instead of "SSL_CTX_use_certificate_file" to support server certificates signed by intermediaries.
+- Better definition of "debug" macro for Win32 builds.
+- Use __inline for Win32 builds.
+- Avoid checking choked pipe if no extension has more data to write.
+- zlib update 1.2.7
+- Set listen backlog to SOMAXCONN.
+- Fixed operator precedence bug.
+- Avoid deflate of small packets.
+- Support compressed packets bigger than MAX_USER_RX_BUFFER. (AG adapted style and removed logging stuff)
+- Allow extensions when no protocol was specified.
+- Added extension "deflate-frame". Using by default instead of "deflate-stream".
+- Added support for extensions that only manipulate application data.
+- Fixed deflate-stream extension. When the output buffer was exhausted the input buffer was discarded without checking if zlib had actually consumed all the input, now we copy the remaining input data for the next call.
+- Added private macro AWAITING_TIMEOUT instead of harcoded value 5.
+- Fixed spacing.
+- Added context creation parameter for CA certificates file.
+- Return NULL if the handshake failed to complete, libwebsocket_service_fd closes and frees the websocket in that case.
+- Ignoring linux build files
+- Use feature check rather than browser check.
+- Changed client handshake to use "Origin" instead of "Sec-WebSocket-Origin" as defined by RFC 6455 when using version 13 of the protocol.
+- Fixed compiler warnings on Windows.
+- Added new status codes from RFC 6455.
+- Fixed compiler warning on Windows.
+- required version of autoconf can be lower
+- Static variable is now const.
+- add context construction option to skip server hostname lookup
+- add missing docs for new context user pointer
+- libwebsocket_service_fd: EAGAIN is harmless, treat like EINTR
+- libwebsocket_context: add userspace pointer for use before wsi creation
+- lib/Makefile.am: whitespace fix
+- add pkg-config file libwebsockets.pc
+- Added test.html favicon.ico to EXTRA_DIST.
+- Add missing .h files to sources.
+- Add kernel doc to extra_dist.
+- always taking an interest in ppid wont hurt
+- remove depcomp
+- stop being so fragile on socket lifecycle
+- use autogen.sh
+- changelog update
+
+* Mon Dec 03 2012 tripzero <kevron_m_rees@linux.intel.com> 1.0_branch@2e3587f
+- Updating changelog for 2.0alpha
+
+* Wed Sep 05 2012 Rusty Lynch <rusty.lynch@intel.com> 0067a71
+- Adding Tizen packaging files
+
+* Wed Aug 22 2012 Rusty Lynch <rusty.lynch@intel.com> 71e5369
+- Initial packaging 
+
diff --git a/packaging/libwebsockets.spec b/packaging/libwebsockets.spec
new file mode 100644 (file)
index 0000000..b013466
--- /dev/null
@@ -0,0 +1,59 @@
+Name:       libwebsockets
+Summary:    WebSocket Library
+Version:    1.2
+Release:    1
+Group:      System/Libraries
+License:    LGPL-2.1+
+URL:        http://git.warmcat.com/cgi-bin/cgit/libwebsockets/
+Source0:    %{name}-%{version}.tar.bz2
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires: zlib-devel
+BuildRequires: openssl-devel
+BuildRequires: cmake
+BuildRequires: pkgconfig(libsystemd-daemon)
+
+%define _optdeveldir /opt/usr/devel/usr/
+
+%description
+C Websockets Server Library
+
+%package devel
+Summary:    Development files for %{name}
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description devel
+Development files needed for building websocket clients and servers
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+
+%cmake -DWITH_SSL=On -DWITH_SD_DAEMON=ON -DWITHOUT_TESTAPPS=ON
+
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+
+%make_install
+mkdir -p %{buildroot}%{_datadir}/license
+install -m0644 %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}%{_datadir}/license/%{name}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libwebsockets*.so.*
+%{_datadir}/license/%{name}
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/libwebsockets.h
+%{_libdir}/libwebsockets.so
+%{_libdir}/pkgconfig/*
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
new file mode 100755 (executable)
index 0000000..241310e
--- /dev/null
@@ -0,0 +1,2238 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##
+## Copyright (C) 2000, 1  Tim Waugh <twaugh@redhat.com>          ##
+## Copyright (C) 2001  Simon Huggins                             ##
+## Copyright (C) 2005-2009  Randy Dunlap                         ##
+##                                                              ##
+## #define enhancements by Armin Kuster <akuster@mvista.com>    ##
+## Copyright (c) 2000 MontaVista Software, Inc.                         ##
+##                                                              ##
+## This software falls under the GNU General Public License.     ##
+## Please read the COPYING file for more information             ##
+
+# w.o. 03-11-2000: added the '-filelist' option.
+
+# 18/01/2001 -         Cleanups
+#              Functions prototyped as foo(void) same as foo()
+#              Stop eval'ing where we don't need to.
+# -- huggie@earth.li
+
+# 27/06/2001 -  Allowed whitespace after initial "/**" and
+#               allowed comments before function declarations.
+# -- Christian Kreibich <ck@whoop.org>
+
+# Still to do:
+#      - add perldoc documentation
+#      - Look more closely at some of the scarier bits :)
+
+# 26/05/2001 -         Support for separate source and object trees.
+#              Return error code.
+#              Keith Owens <kaos@ocs.com.au>
+
+# 23/09/2001 - Added support for typedefs, structs, enums and unions
+#              Support for Context section; can be terminated using empty line
+#              Small fixes (like spaces vs. \s in regex)
+# -- Tim Jansen <tim@tjansen.de>
+
+
+#
+# This will read a 'c' file and scan for embedded comments in the
+# style of gnome comments (+minor extensions - see below).
+#
+
+# Note: This only supports 'c'.
+
+# usage:
+# kernel-doc [ -docbook | -html | -text | -man ] [ -no-doc-sections ]
+#           [ -function funcname [ -function funcname ...] ] c file(s)s > outputfile
+# or
+#           [ -nofunction funcname [ -function funcname ...] ] c file(s)s > outputfile
+#
+#  Set output format using one of -docbook -html -text or -man.  Default is man.
+#
+#  -no-doc-sections
+#      Do not output DOC: sections
+#
+#  -function funcname
+#      If set, then only generate documentation for the given function(s) or
+#      DOC: section titles.  All other functions and DOC: sections are ignored.
+#
+#  -nofunction funcname
+#      If set, then only generate documentation for the other function(s)/DOC:
+#      sections. Cannot be used together with -function (yes, that's a bug --
+#      perl hackers can fix it 8))
+#
+#  c files - list of 'c' files to process
+#
+#  All output goes to stdout, with errors to stderr.
+
+#
+# format of comments.
+# In the following table, (...)? signifies optional structure.
+#                         (...)* signifies 0 or more structure elements
+# /**
+#  * function_name(:)? (- short description)?
+# (* @parameterx: (description of parameter x)?)*
+# (* a blank line)?
+#  * (Description:)? (Description of function)?
+#  * (section header: (section description)? )*
+#  (*)?*/
+#
+# So .. the trivial example would be:
+#
+# /**
+#  * my_function
+#  */
+#
+# If the Description: header tag is omitted, then there must be a blank line
+# after the last parameter specification.
+# e.g.
+# /**
+#  * my_function - does my stuff
+#  * @my_arg: its mine damnit
+#  *
+#  * Does my stuff explained.
+#  */
+#
+#  or, could also use:
+# /**
+#  * my_function - does my stuff
+#  * @my_arg: its mine damnit
+#  * Description: Does my stuff explained.
+#  */
+# etc.
+#
+# Besides functions you can also write documentation for structs, unions,
+# enums and typedefs. Instead of the function name you must write the name
+# of the declaration;  the struct/union/enum/typedef must always precede
+# the name. Nesting of declarations is not supported.
+# Use the argument mechanism to document members or constants.
+# e.g.
+# /**
+#  * struct my_struct - short description
+#  * @a: first member
+#  * @b: second member
+#  *
+#  * Longer description
+#  */
+# struct my_struct {
+#     int a;
+#     int b;
+# /* private: */
+#     int c;
+# };
+#
+# All descriptions can be multiline, except the short function description.
+#
+# You can also add additional sections. When documenting kernel functions you
+# should document the "Context:" of the function, e.g. whether the functions
+# can be called form interrupts. Unlike other sections you can end it with an
+# empty line.
+# Example-sections should contain the string EXAMPLE so that they are marked
+# appropriately in DocBook.
+#
+# Example:
+# /**
+#  * user_function - function that can only be called in user context
+#  * @a: some argument
+#  * Context: !in_interrupt()
+#  *
+#  * Some description
+#  * Example:
+#  *    user_function(22);
+#  */
+# ...
+#
+#
+# All descriptive text is further processed, scanning for the following special
+# patterns, which are highlighted appropriately.
+#
+# 'funcname()' - function
+# '$ENVVAR' - environmental variable
+# '&struct_name' - name of a structure (up to two words including 'struct')
+# '@parameter' - name of a parameter
+# '%CONST' - name of a constant.
+
+my $errors = 0;
+my $warnings = 0;
+my $anon_struct_union = 0;
+
+# match expressions used to find embedded type information
+my $type_constant = '\%([-_\w]+)';
+my $type_func = '(\w+)\(\)';
+my $type_param = '\@(\w+)';
+my $type_struct = '\&((struct\s*)*[_\w]+)';
+my $type_struct_xml = '\\&amp;((struct\s*)*[_\w]+)';
+my $type_env = '(\$\w+)';
+
+# Output conversion substitutions.
+#  One for each output format
+
+# these work fairly well
+my %highlights_html = ( $type_constant, "<i>\$1</i>",
+                       $type_func, "<b>\$1</b>",
+                       $type_struct_xml, "<i>\$1</i>",
+                       $type_env, "<b><i>\$1</i></b>",
+                       $type_param, "<tt><b>\$1</b></tt>" );
+my $local_lt = "\\\\\\\\lt:";
+my $local_gt = "\\\\\\\\gt:";
+my $blankline_html = $local_lt . "p" . $local_gt;      # was "<p>"
+
+# XML, docbook format
+my %highlights_xml = ( "([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>",
+                       $type_constant, "<constant>\$1</constant>",
+                       $type_func, "<function>\$1</function>",
+                       $type_struct_xml, "<structname>\$1</structname>",
+                       $type_env, "<envar>\$1</envar>",
+                       $type_param, "<parameter>\$1</parameter>" );
+my $blankline_xml = $local_lt . "/para" . $local_gt . $local_lt . "para" . $local_gt . "\n";
+
+# gnome, docbook format
+my %highlights_gnome = ( $type_constant, "<replaceable class=\"option\">\$1</replaceable>",
+                        $type_func, "<function>\$1</function>",
+                        $type_struct, "<structname>\$1</structname>",
+                        $type_env, "<envar>\$1</envar>",
+                        $type_param, "<parameter>\$1</parameter>" );
+my $blankline_gnome = "</para><para>\n";
+
+# these are pretty rough
+my %highlights_man = ( $type_constant, "\$1",
+                      $type_func, "\\\\fB\$1\\\\fP",
+                      $type_struct, "\\\\fI\$1\\\\fP",
+                      $type_param, "\\\\fI\$1\\\\fP" );
+my $blankline_man = "";
+
+# text-mode
+my %highlights_text = ( $type_constant, "\$1",
+                       $type_func, "\$1",
+                       $type_struct, "\$1",
+                       $type_param, "\$1" );
+my $blankline_text = "";
+
+
+sub usage {
+    print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man ] [ -no-doc-sections ]\n";
+    print "         [ -function funcname [ -function funcname ...] ]\n";
+    print "         [ -nofunction funcname [ -nofunction funcname ...] ]\n";
+    print "         c source file(s) > outputfile\n";
+    print "         -v : verbose output, more warnings & other info listed\n";
+    exit 1;
+}
+
+# read arguments
+if ($#ARGV == -1) {
+    usage();
+}
+
+my $verbose = 0;
+my $output_mode = "man";
+my $no_doc_sections = 0;
+my %highlights = %highlights_man;
+my $blankline = $blankline_man;
+my $modulename = "Kernel API";
+my $function_only = 0;
+my $man_date = ('January', 'February', 'March', 'April', 'May', 'June',
+               'July', 'August', 'September', 'October',
+               'November', 'December')[(localtime)[4]] .
+  " " . ((localtime)[5]+1900);
+
+# Essentially these are globals
+# They probably want to be tidied up, made more localised or something.
+# CAVEAT EMPTOR!  Some of the others I localised may not want to be, which
+# could cause "use of undefined value" or other bugs.
+my ($function, %function_table, %parametertypes, $declaration_purpose);
+my ($type, $declaration_name, $return_type);
+my ($newsection, $newcontents, $prototype, $filelist, $brcount, %source_map);
+
+if (defined($ENV{'KBUILD_VERBOSE'})) {
+       $verbose = "$ENV{'KBUILD_VERBOSE'}";
+}
+
+# Generated docbook code is inserted in a template at a point where
+# docbook v3.1 requires a non-zero sequence of RefEntry's; see:
+# http://www.oasis-open.org/docbook/documentation/reference/html/refentry.html
+# We keep track of number of generated entries and generate a dummy
+# if needs be to ensure the expanded template can be postprocessed
+# into html.
+my $section_counter = 0;
+
+my $lineprefix="";
+
+# states
+# 0 - normal code
+# 1 - looking for function name
+# 2 - scanning field start.
+# 3 - scanning prototype.
+# 4 - documentation block
+my $state;
+my $in_doc_sect;
+
+#declaration types: can be
+# 'function', 'struct', 'union', 'enum', 'typedef'
+my $decl_type;
+
+my $doc_special = "\@\%\$\&";
+
+my $doc_start = '^/\*\*\s*$'; # Allow whitespace at end of comment start.
+my $doc_end = '\*/';
+my $doc_com = '\s*\*\s*';
+my $doc_decl = $doc_com . '(\w+)';
+my $doc_sect = $doc_com . '([' . $doc_special . ']?[\w\s]+):(.*)';
+my $doc_content = $doc_com . '(.*)';
+my $doc_block = $doc_com . 'DOC:\s*(.*)?';
+
+my %constants;
+my %parameterdescs;
+my @parameterlist;
+my %sections;
+my @sectionlist;
+my $sectcheck;
+my $struct_actual;
+
+my $contents = "";
+my $section_default = "Description";   # default section
+my $section_intro = "Introduction";
+my $section = $section_default;
+my $section_context = "Context";
+
+my $undescribed = "-- undescribed --";
+
+reset_state();
+
+while ($ARGV[0] =~ m/^-(.*)/) {
+    my $cmd = shift @ARGV;
+    if ($cmd eq "-html") {
+       $output_mode = "html";
+       %highlights = %highlights_html;
+       $blankline = $blankline_html;
+    } elsif ($cmd eq "-man") {
+       $output_mode = "man";
+       %highlights = %highlights_man;
+       $blankline = $blankline_man;
+    } elsif ($cmd eq "-text") {
+       $output_mode = "text";
+       %highlights = %highlights_text;
+       $blankline = $blankline_text;
+    } elsif ($cmd eq "-docbook") {
+       $output_mode = "xml";
+       %highlights = %highlights_xml;
+       $blankline = $blankline_xml;
+    } elsif ($cmd eq "-gnome") {
+       $output_mode = "gnome";
+       %highlights = %highlights_gnome;
+       $blankline = $blankline_gnome;
+    } elsif ($cmd eq "-module") { # not needed for XML, inherits from calling document
+       $modulename = shift @ARGV;
+    } elsif ($cmd eq "-function") { # to only output specific functions
+       $function_only = 1;
+       $function = shift @ARGV;
+       $function_table{$function} = 1;
+    } elsif ($cmd eq "-nofunction") { # to only output specific functions
+       $function_only = 2;
+       $function = shift @ARGV;
+       $function_table{$function} = 1;
+    } elsif ($cmd eq "-v") {
+       $verbose = 1;
+    } elsif (($cmd eq "-h") || ($cmd eq "--help")) {
+       usage();
+    } elsif ($cmd eq '-filelist') {
+           $filelist = shift @ARGV;
+    } elsif ($cmd eq '-no-doc-sections') {
+           $no_doc_sections = 1;
+    }
+}
+
+# get kernel version from env
+sub get_kernel_version() {
+    my $version = 'unknown kernel version';
+
+    if (defined($ENV{'KERNELVERSION'})) {
+       $version = $ENV{'KERNELVERSION'};
+    }
+    return $version;
+}
+my $kernelversion = get_kernel_version();
+
+# generate a sequence of code that will splice in highlighting information
+# using the s// operator.
+my $dohighlight = "";
+foreach my $pattern (keys %highlights) {
+#   print STDERR "scanning pattern:$pattern, highlight:($highlights{$pattern})\n";
+    $dohighlight .=  "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n";
+}
+
+##
+# dumps section contents to arrays/hashes intended for that purpose.
+#
+sub dump_section {
+    my $file = shift;
+    my $name = shift;
+    my $contents = join "\n", @_;
+
+    if ($name =~ m/$type_constant/) {
+       $name = $1;
+#      print STDERR "constant section '$1' = '$contents'\n";
+       $constants{$name} = $contents;
+    } elsif ($name =~ m/$type_param/) {
+#      print STDERR "parameter def '$1' = '$contents'\n";
+       $name = $1;
+       $parameterdescs{$name} = $contents;
+       $sectcheck = $sectcheck . $name . " ";
+    } elsif ($name eq "@\.\.\.") {
+#      print STDERR "parameter def '...' = '$contents'\n";
+       $name = "...";
+       $parameterdescs{$name} = $contents;
+       $sectcheck = $sectcheck . $name . " ";
+    } else {
+#      print STDERR "other section '$name' = '$contents'\n";
+       if (defined($sections{$name}) && ($sections{$name} ne "")) {
+               print STDERR "Error(${file}:$.): duplicate section name '$name'\n";
+               ++$errors;
+       }
+       $sections{$name} = $contents;
+       push @sectionlist, $name;
+    }
+}
+
+##
+# dump DOC: section after checking that it should go out
+#
+sub dump_doc_section {
+    my $file = shift;
+    my $name = shift;
+    my $contents = join "\n", @_;
+
+    if ($no_doc_sections) {
+        return;
+    }
+
+    if (($function_only == 0) ||
+       ( $function_only == 1 && defined($function_table{$name})) ||
+       ( $function_only == 2 && !defined($function_table{$name})))
+    {
+       dump_section($file, $name, $contents);
+       output_blockhead({'sectionlist' => \@sectionlist,
+                         'sections' => \%sections,
+                         'module' => $modulename,
+                         'content-only' => ($function_only != 0), });
+    }
+}
+
+##
+# output function
+#
+# parameterdescs, a hash.
+#  function => "function name"
+#  parameterlist => @list of parameters
+#  parameterdescs => %parameter descriptions
+#  sectionlist => @list of sections
+#  sections => %section descriptions
+#
+
+sub output_highlight {
+    my $contents = join "\n",@_;
+    my $line;
+
+#   DEBUG
+#   if (!defined $contents) {
+#      use Carp;
+#      confess "output_highlight got called with no args?\n";
+#   }
+
+    if ($output_mode eq "html" || $output_mode eq "xml") {
+       $contents = local_unescape($contents);
+       # convert data read & converted thru xml_escape() into &xyz; format:
+       $contents =~ s/\\\\\\/&/g;
+    }
+#   print STDERR "contents b4:$contents\n";
+    eval $dohighlight;
+    die $@ if $@;
+#   print STDERR "contents af:$contents\n";
+
+    foreach $line (split "\n", $contents) {
+       if ($line eq ""){
+           print $lineprefix, local_unescape($blankline);
+       } else {
+           $line =~ s/\\\\\\/\&/g;
+           if ($output_mode eq "man" && substr($line, 0, 1) eq ".") {
+               print "\\&$line";
+           } else {
+               print $lineprefix, $line;
+           }
+       }
+       print "\n";
+    }
+}
+
+#output sections in html
+sub output_section_html(%) {
+    my %args = %{$_[0]};
+    my $section;
+
+    foreach $section (@{$args{'sectionlist'}}) {
+       print "<h3>$section</h3>\n";
+       print "<blockquote>\n";
+       output_highlight($args{'sections'}{$section});
+       print "</blockquote>\n";
+    }
+}
+
+# output enum in html
+sub output_enum_html(%) {
+    my %args = %{$_[0]};
+    my ($parameter);
+    my $count;
+    print "<h2>enum " . $args{'enum'} . "</h2>\n";
+
+    print "<b>enum " . $args{'enum'} . "</b> {<br>\n";
+    $count = 0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       print " <b>" . $parameter . "</b>";
+       if ($count != $#{$args{'parameterlist'}}) {
+           $count++;
+           print ",\n";
+       }
+       print "<br>";
+    }
+    print "};<br>\n";
+
+    print "<h3>Constants</h3>\n";
+    print "<dl>\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       print "<dt><b>" . $parameter . "</b>\n";
+       print "<dd>";
+       output_highlight($args{'parameterdescs'}{$parameter});
+    }
+    print "</dl>\n";
+    output_section_html(@_);
+    print "<hr>\n";
+}
+
+# output typedef in html
+sub output_typedef_html(%) {
+    my %args = %{$_[0]};
+    my ($parameter);
+    my $count;
+    print "<h2>typedef " . $args{'typedef'} . "</h2>\n";
+
+    print "<b>typedef " . $args{'typedef'} . "</b>\n";
+    output_section_html(@_);
+    print "<hr>\n";
+}
+
+# output struct in html
+sub output_struct_html(%) {
+    my %args = %{$_[0]};
+    my ($parameter);
+
+    print "<h2>" . $args{'type'} . " " . $args{'struct'} . " - " . $args{'purpose'} . "</h2>\n";
+    print "<b>" . $args{'type'} . " " . $args{'struct'} . "</b> {<br>\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       if ($parameter =~ /^#/) {
+               print "$parameter<br>\n";
+               next;
+       }
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+       $type = $args{'parametertypes'}{$parameter};
+       if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+           # pointer-to-function
+           print "&nbsp; &nbsp; <i>$1</i><b>$parameter</b>) <i>($2)</i>;<br>\n";
+       } elsif ($type =~ m/^(.*?)\s*(:.*)/) {
+           # bitfield
+           print "&nbsp; &nbsp; <i>$1</i> <b>$parameter</b>$2;<br>\n";
+       } else {
+           print "&nbsp; &nbsp; <i>$type</i> <b>$parameter</b>;<br>\n";
+       }
+    }
+    print "};<br>\n";
+
+    print "<h3>Members</h3>\n";
+    print "<dl>\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       ($parameter =~ /^#/) && next;
+
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+       print "<dt><b>" . $parameter . "</b>\n";
+       print "<dd>";
+       output_highlight($args{'parameterdescs'}{$parameter_name});
+    }
+    print "</dl>\n";
+    output_section_html(@_);
+    print "<hr>\n";
+}
+
+# output function in html
+sub output_function_html(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+
+    print "<h2>" . $args{'function'} . " - " . $args{'purpose'} . "</h2>\n";
+    print "<i>" . $args{'functiontype'} . "</i>\n";
+    print "<b>" . $args{'function'} . "</b>\n";
+    print "(";
+    $count = 0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       $type = $args{'parametertypes'}{$parameter};
+       if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+           # pointer-to-function
+           print "<i>$1</i><b>$parameter</b>) <i>($2)</i>";
+       } else {
+           print "<i>" . $type . "</i> <b>" . $parameter . "</b>";
+       }
+       if ($count != $#{$args{'parameterlist'}}) {
+           $count++;
+           print ",\n";
+       }
+    }
+    print ")\n";
+
+    print "<h3>Arguments</h3>\n";
+    print "<dl>\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+       print "<dt><b>" . $parameter . "</b>\n";
+       print "<dd>";
+       output_highlight($args{'parameterdescs'}{$parameter_name});
+    }
+    print "</dl>\n";
+    output_section_html(@_);
+    print "<hr>\n";
+}
+
+# output DOC: block header in html
+sub output_blockhead_html(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+
+    foreach $section (@{$args{'sectionlist'}}) {
+       print "<h3>$section</h3>\n";
+       print "<ul>\n";
+       output_highlight($args{'sections'}{$section});
+       print "</ul>\n";
+    }
+    print "<hr>\n";
+}
+
+sub output_section_xml(%) {
+    my %args = %{$_[0]};
+    my $section;
+    # print out each section
+    $lineprefix="   ";
+    foreach $section (@{$args{'sectionlist'}}) {
+       print "<refsect1>\n";
+       print "<title>$section</title>\n";
+       if ($section =~ m/EXAMPLE/i) {
+           print "<informalexample><programlisting>\n";
+       } else {
+           print "<para>\n";
+       }
+       output_highlight($args{'sections'}{$section});
+       if ($section =~ m/EXAMPLE/i) {
+           print "</programlisting></informalexample>\n";
+       } else {
+           print "</para>\n";
+       }
+       print "</refsect1>\n";
+    }
+}
+
+# output function in XML DocBook
+sub output_function_xml(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+    my $id;
+
+    $id = "API-" . $args{'function'};
+    $id =~ s/[^A-Za-z0-9]/-/g;
+
+    print "<refentry id=\"$id\">\n";
+    print "<refentryinfo>\n";
+    print " <title>LINUX</title>\n";
+    print " <productname>Kernel Hackers Manual</productname>\n";
+    print " <date>$man_date</date>\n";
+    print "</refentryinfo>\n";
+    print "<refmeta>\n";
+    print " <refentrytitle><phrase>" . $args{'function'} . "</phrase></refentrytitle>\n";
+    print " <manvolnum>9</manvolnum>\n";
+    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
+    print "</refmeta>\n";
+    print "<refnamediv>\n";
+    print " <refname>" . $args{'function'} . "</refname>\n";
+    print " <refpurpose>\n";
+    print "  ";
+    output_highlight ($args{'purpose'});
+    print " </refpurpose>\n";
+    print "</refnamediv>\n";
+
+    print "<refsynopsisdiv>\n";
+    print " <title>Synopsis</title>\n";
+    print "  <funcsynopsis><funcprototype>\n";
+    print "   <funcdef>" . $args{'functiontype'} . " ";
+    print "<function>" . $args{'function'} . " </function></funcdef>\n";
+
+    $count = 0;
+    if ($#{$args{'parameterlist'}} >= 0) {
+       foreach $parameter (@{$args{'parameterlist'}}) {
+           $type = $args{'parametertypes'}{$parameter};
+           if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+               # pointer-to-function
+               print "   <paramdef>$1<parameter>$parameter</parameter>)\n";
+               print "     <funcparams>$2</funcparams></paramdef>\n";
+           } else {
+               print "   <paramdef>" . $type;
+               print " <parameter>$parameter</parameter></paramdef>\n";
+           }
+       }
+    } else {
+       print "  <void/>\n";
+    }
+    print "  </funcprototype></funcsynopsis>\n";
+    print "</refsynopsisdiv>\n";
+
+    # print parameters
+    print "<refsect1>\n <title>Arguments</title>\n";
+    if ($#{$args{'parameterlist'}} >= 0) {
+       print " <variablelist>\n";
+       foreach $parameter (@{$args{'parameterlist'}}) {
+           my $parameter_name = $parameter;
+           $parameter_name =~ s/\[.*//;
+
+           print "  <varlistentry>\n   <term><parameter>$parameter</parameter></term>\n";
+           print "   <listitem>\n    <para>\n";
+           $lineprefix="     ";
+           output_highlight($args{'parameterdescs'}{$parameter_name});
+           print "    </para>\n   </listitem>\n  </varlistentry>\n";
+       }
+       print " </variablelist>\n";
+    } else {
+       print " <para>\n  None\n </para>\n";
+    }
+    print "</refsect1>\n";
+
+    output_section_xml(@_);
+    print "</refentry>\n\n";
+}
+
+# output struct in XML DocBook
+sub output_struct_xml(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $id;
+
+    $id = "API-struct-" . $args{'struct'};
+    $id =~ s/[^A-Za-z0-9]/-/g;
+
+    print "<refentry id=\"$id\">\n";
+    print "<refentryinfo>\n";
+    print " <title>LINUX</title>\n";
+    print " <productname>Kernel Hackers Manual</productname>\n";
+    print " <date>$man_date</date>\n";
+    print "</refentryinfo>\n";
+    print "<refmeta>\n";
+    print " <refentrytitle><phrase>" . $args{'type'} . " " . $args{'struct'} . "</phrase></refentrytitle>\n";
+    print " <manvolnum>9</manvolnum>\n";
+    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
+    print "</refmeta>\n";
+    print "<refnamediv>\n";
+    print " <refname>" . $args{'type'} . " " . $args{'struct'} . "</refname>\n";
+    print " <refpurpose>\n";
+    print "  ";
+    output_highlight ($args{'purpose'});
+    print " </refpurpose>\n";
+    print "</refnamediv>\n";
+
+    print "<refsynopsisdiv>\n";
+    print " <title>Synopsis</title>\n";
+    print "  <programlisting>\n";
+    print $args{'type'} . " " . $args{'struct'} . " {\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       if ($parameter =~ /^#/) {
+           print "$parameter\n";
+           next;
+       }
+
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       defined($args{'parameterdescs'}{$parameter_name}) || next;
+       ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+       $type = $args{'parametertypes'}{$parameter};
+       if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+           # pointer-to-function
+           print "  $1 $parameter) ($2);\n";
+       } elsif ($type =~ m/^(.*?)\s*(:.*)/) {
+           # bitfield
+           print "  $1 $parameter$2;\n";
+       } else {
+           print "  " . $type . " " . $parameter . ";\n";
+       }
+    }
+    print "};";
+    print "  </programlisting>\n";
+    print "</refsynopsisdiv>\n";
+
+    print " <refsect1>\n";
+    print "  <title>Members</title>\n";
+
+    if ($#{$args{'parameterlist'}} >= 0) {
+    print "  <variablelist>\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+      ($parameter =~ /^#/) && next;
+
+      my $parameter_name = $parameter;
+      $parameter_name =~ s/\[.*//;
+
+      defined($args{'parameterdescs'}{$parameter_name}) || next;
+      ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+      print "    <varlistentry>";
+      print "      <term>$parameter</term>\n";
+      print "      <listitem><para>\n";
+      output_highlight($args{'parameterdescs'}{$parameter_name});
+      print "      </para></listitem>\n";
+      print "    </varlistentry>\n";
+    }
+    print "  </variablelist>\n";
+    } else {
+       print " <para>\n  None\n </para>\n";
+    }
+    print " </refsect1>\n";
+
+    output_section_xml(@_);
+
+    print "</refentry>\n\n";
+}
+
+# output enum in XML DocBook
+sub output_enum_xml(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+    my $id;
+
+    $id = "API-enum-" . $args{'enum'};
+    $id =~ s/[^A-Za-z0-9]/-/g;
+
+    print "<refentry id=\"$id\">\n";
+    print "<refentryinfo>\n";
+    print " <title>LINUX</title>\n";
+    print " <productname>Kernel Hackers Manual</productname>\n";
+    print " <date>$man_date</date>\n";
+    print "</refentryinfo>\n";
+    print "<refmeta>\n";
+    print " <refentrytitle><phrase>enum " . $args{'enum'} . "</phrase></refentrytitle>\n";
+    print " <manvolnum>9</manvolnum>\n";
+    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
+    print "</refmeta>\n";
+    print "<refnamediv>\n";
+    print " <refname>enum " . $args{'enum'} . "</refname>\n";
+    print " <refpurpose>\n";
+    print "  ";
+    output_highlight ($args{'purpose'});
+    print " </refpurpose>\n";
+    print "</refnamediv>\n";
+
+    print "<refsynopsisdiv>\n";
+    print " <title>Synopsis</title>\n";
+    print "  <programlisting>\n";
+    print "enum " . $args{'enum'} . " {\n";
+    $count = 0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       print "  $parameter";
+       if ($count != $#{$args{'parameterlist'}}) {
+           $count++;
+           print ",";
+       }
+       print "\n";
+    }
+    print "};";
+    print "  </programlisting>\n";
+    print "</refsynopsisdiv>\n";
+
+    print "<refsect1>\n";
+    print " <title>Constants</title>\n";
+    print "  <variablelist>\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+      my $parameter_name = $parameter;
+      $parameter_name =~ s/\[.*//;
+
+      print "    <varlistentry>";
+      print "      <term>$parameter</term>\n";
+      print "      <listitem><para>\n";
+      output_highlight($args{'parameterdescs'}{$parameter_name});
+      print "      </para></listitem>\n";
+      print "    </varlistentry>\n";
+    }
+    print "  </variablelist>\n";
+    print "</refsect1>\n";
+
+    output_section_xml(@_);
+
+    print "</refentry>\n\n";
+}
+
+# output typedef in XML DocBook
+sub output_typedef_xml(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $id;
+
+    $id = "API-typedef-" . $args{'typedef'};
+    $id =~ s/[^A-Za-z0-9]/-/g;
+
+    print "<refentry id=\"$id\">\n";
+    print "<refentryinfo>\n";
+    print " <title>LINUX</title>\n";
+    print " <productname>Kernel Hackers Manual</productname>\n";
+    print " <date>$man_date</date>\n";
+    print "</refentryinfo>\n";
+    print "<refmeta>\n";
+    print " <refentrytitle><phrase>typedef " . $args{'typedef'} . "</phrase></refentrytitle>\n";
+    print " <manvolnum>9</manvolnum>\n";
+    print "</refmeta>\n";
+    print "<refnamediv>\n";
+    print " <refname>typedef " . $args{'typedef'} . "</refname>\n";
+    print " <refpurpose>\n";
+    print "  ";
+    output_highlight ($args{'purpose'});
+    print " </refpurpose>\n";
+    print "</refnamediv>\n";
+
+    print "<refsynopsisdiv>\n";
+    print " <title>Synopsis</title>\n";
+    print "  <synopsis>typedef " . $args{'typedef'} . ";</synopsis>\n";
+    print "</refsynopsisdiv>\n";
+
+    output_section_xml(@_);
+
+    print "</refentry>\n\n";
+}
+
+# output in XML DocBook
+sub output_blockhead_xml(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+
+    my $id = $args{'module'};
+    $id =~ s/[^A-Za-z0-9]/-/g;
+
+    # print out each section
+    $lineprefix="   ";
+    foreach $section (@{$args{'sectionlist'}}) {
+       if (!$args{'content-only'}) {
+               print "<refsect1>\n <title>$section</title>\n";
+       }
+       if ($section =~ m/EXAMPLE/i) {
+           print "<example><para>\n";
+       } else {
+           print "<para>\n";
+       }
+       output_highlight($args{'sections'}{$section});
+       if ($section =~ m/EXAMPLE/i) {
+           print "</para></example>\n";
+       } else {
+           print "</para>";
+       }
+       if (!$args{'content-only'}) {
+               print "\n</refsect1>\n";
+       }
+    }
+
+    print "\n\n";
+}
+
+# output in XML DocBook
+sub output_function_gnome {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+    my $id;
+
+    $id = $args{'module'} . "-" . $args{'function'};
+    $id =~ s/[^A-Za-z0-9]/-/g;
+
+    print "<sect2>\n";
+    print " <title id=\"$id\">" . $args{'function'} . "</title>\n";
+
+    print "  <funcsynopsis>\n";
+    print "   <funcdef>" . $args{'functiontype'} . " ";
+    print "<function>" . $args{'function'} . " ";
+    print "</function></funcdef>\n";
+
+    $count = 0;
+    if ($#{$args{'parameterlist'}} >= 0) {
+       foreach $parameter (@{$args{'parameterlist'}}) {
+           $type = $args{'parametertypes'}{$parameter};
+           if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+               # pointer-to-function
+               print "   <paramdef>$1 <parameter>$parameter</parameter>)\n";
+               print "     <funcparams>$2</funcparams></paramdef>\n";
+           } else {
+               print "   <paramdef>" . $type;
+               print " <parameter>$parameter</parameter></paramdef>\n";
+           }
+       }
+    } else {
+       print "  <void>\n";
+    }
+    print "  </funcsynopsis>\n";
+    if ($#{$args{'parameterlist'}} >= 0) {
+       print " <informaltable pgwide=\"1\" frame=\"none\" role=\"params\">\n";
+       print "<tgroup cols=\"2\">\n";
+       print "<colspec colwidth=\"2*\">\n";
+       print "<colspec colwidth=\"8*\">\n";
+       print "<tbody>\n";
+       foreach $parameter (@{$args{'parameterlist'}}) {
+           my $parameter_name = $parameter;
+           $parameter_name =~ s/\[.*//;
+
+           print "  <row><entry align=\"right\"><parameter>$parameter</parameter></entry>\n";
+           print "   <entry>\n";
+           $lineprefix="     ";
+           output_highlight($args{'parameterdescs'}{$parameter_name});
+           print "    </entry></row>\n";
+       }
+       print " </tbody></tgroup></informaltable>\n";
+    } else {
+       print " <para>\n  None\n </para>\n";
+    }
+
+    # print out each section
+    $lineprefix="   ";
+    foreach $section (@{$args{'sectionlist'}}) {
+       print "<simplesect>\n <title>$section</title>\n";
+       if ($section =~ m/EXAMPLE/i) {
+           print "<example><programlisting>\n";
+       } else {
+       }
+       print "<para>\n";
+       output_highlight($args{'sections'}{$section});
+       print "</para>\n";
+       if ($section =~ m/EXAMPLE/i) {
+           print "</programlisting></example>\n";
+       } else {
+       }
+       print " </simplesect>\n";
+    }
+
+    print "</sect2>\n\n";
+}
+
+##
+# output function in man
+sub output_function_man(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+
+    print ".TH \"$args{'function'}\" 9 \"$args{'function'}\" \"$man_date\" \"Kernel Hacker's Manual\" LINUX\n";
+
+    print ".SH NAME\n";
+    print $args{'function'} . " \\- " . $args{'purpose'} . "\n";
+
+    print ".SH SYNOPSIS\n";
+    if ($args{'functiontype'} ne "") {
+       print ".B \"" . $args{'functiontype'} . "\" " . $args{'function'} . "\n";
+    } else {
+       print ".B \"" . $args{'function'} . "\n";
+    }
+    $count = 0;
+    my $parenth = "(";
+    my $post = ",";
+    foreach my $parameter (@{$args{'parameterlist'}}) {
+       if ($count == $#{$args{'parameterlist'}}) {
+           $post = ");";
+       }
+       $type = $args{'parametertypes'}{$parameter};
+       if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+           # pointer-to-function
+           print ".BI \"" . $parenth . $1 . "\" " . $parameter . " \") (" . $2 . ")" . $post . "\"\n";
+       } else {
+           $type =~ s/([^\*])$/$1 /;
+           print ".BI \"" . $parenth . $type . "\" " . $parameter . " \"" . $post . "\"\n";
+       }
+       $count++;
+       $parenth = "";
+    }
+
+    print ".SH ARGUMENTS\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       print ".IP \"" . $parameter . "\" 12\n";
+       output_highlight($args{'parameterdescs'}{$parameter_name});
+    }
+    foreach $section (@{$args{'sectionlist'}}) {
+       print ".SH \"", uc $section, "\"\n";
+       output_highlight($args{'sections'}{$section});
+    }
+}
+
+##
+# output enum in man
+sub output_enum_man(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+
+    print ".TH \"$args{'module'}\" 9 \"enum $args{'enum'}\" \"$man_date\" \"API Manual\" LINUX\n";
+
+    print ".SH NAME\n";
+    print "enum " . $args{'enum'} . " \\- " . $args{'purpose'} . "\n";
+
+    print ".SH SYNOPSIS\n";
+    print "enum " . $args{'enum'} . " {\n";
+    $count = 0;
+    foreach my $parameter (@{$args{'parameterlist'}}) {
+       print ".br\n.BI \"    $parameter\"\n";
+       if ($count == $#{$args{'parameterlist'}}) {
+           print "\n};\n";
+           last;
+       }
+       else {
+           print ", \n.br\n";
+       }
+       $count++;
+    }
+
+    print ".SH Constants\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       print ".IP \"" . $parameter . "\" 12\n";
+       output_highlight($args{'parameterdescs'}{$parameter_name});
+    }
+    foreach $section (@{$args{'sectionlist'}}) {
+       print ".SH \"$section\"\n";
+       output_highlight($args{'sections'}{$section});
+    }
+}
+
+##
+# output struct in man
+sub output_struct_man(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+
+    print ".TH \"$args{'module'}\" 9 \"" . $args{'type'} . " " . $args{'struct'} . "\" \"$man_date\" \"API Manual\" LINUX\n";
+
+    print ".SH NAME\n";
+    print $args{'type'} . " " . $args{'struct'} . " \\- " . $args{'purpose'} . "\n";
+
+    print ".SH SYNOPSIS\n";
+    print $args{'type'} . " " . $args{'struct'} . " {\n.br\n";
+
+    foreach my $parameter (@{$args{'parameterlist'}}) {
+       if ($parameter =~ /^#/) {
+           print ".BI \"$parameter\"\n.br\n";
+           next;
+       }
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+       $type = $args{'parametertypes'}{$parameter};
+       if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+           # pointer-to-function
+           print ".BI \"    " . $1 . "\" " . $parameter . " \") (" . $2 . ")" . "\"\n;\n";
+       } elsif ($type =~ m/^(.*?)\s*(:.*)/) {
+           # bitfield
+           print ".BI \"    " . $1 . "\ \" " . $parameter . $2 . " \"" . "\"\n;\n";
+       } else {
+           $type =~ s/([^\*])$/$1 /;
+           print ".BI \"    " . $type . "\" " . $parameter . " \"" . "\"\n;\n";
+       }
+       print "\n.br\n";
+    }
+    print "};\n.br\n";
+
+    print ".SH Members\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       ($parameter =~ /^#/) && next;
+
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+       print ".IP \"" . $parameter . "\" 12\n";
+       output_highlight($args{'parameterdescs'}{$parameter_name});
+    }
+    foreach $section (@{$args{'sectionlist'}}) {
+       print ".SH \"$section\"\n";
+       output_highlight($args{'sections'}{$section});
+    }
+}
+
+##
+# output typedef in man
+sub output_typedef_man(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+
+    print ".TH \"$args{'module'}\" 9 \"$args{'typedef'}\" \"$man_date\" \"API Manual\" LINUX\n";
+
+    print ".SH NAME\n";
+    print "typedef " . $args{'typedef'} . " \\- " . $args{'purpose'} . "\n";
+
+    foreach $section (@{$args{'sectionlist'}}) {
+       print ".SH \"$section\"\n";
+       output_highlight($args{'sections'}{$section});
+    }
+}
+
+sub output_blockhead_man(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+
+    print ".TH \"$args{'module'}\" 9 \"$args{'module'}\" \"$man_date\" \"API Manual\" LINUX\n";
+
+    foreach $section (@{$args{'sectionlist'}}) {
+       print ".SH \"$section\"\n";
+       output_highlight($args{'sections'}{$section});
+    }
+}
+
+##
+# output in text
+sub output_function_text(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $start;
+
+    print "Name:\n\n";
+    print $args{'function'} . " - " . $args{'purpose'} . "\n";
+
+    print "\nSynopsis:\n\n";
+    if ($args{'functiontype'} ne "") {
+       $start = $args{'functiontype'} . " " . $args{'function'} . " (";
+    } else {
+       $start = $args{'function'} . " (";
+    }
+    print $start;
+
+    my $count = 0;
+    foreach my $parameter (@{$args{'parameterlist'}}) {
+       $type = $args{'parametertypes'}{$parameter};
+       if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+           # pointer-to-function
+           print $1 . $parameter . ") (" . $2;
+       } else {
+           print $type . " " . $parameter;
+       }
+       if ($count != $#{$args{'parameterlist'}}) {
+           $count++;
+           print ",\n";
+           print " " x length($start);
+       } else {
+           print ");\n\n";
+       }
+    }
+
+    print "Arguments:\n\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       print $parameter . "\n\t" . $args{'parameterdescs'}{$parameter_name} . "\n";
+    }
+    output_section_text(@_);
+}
+
+#output sections in text
+sub output_section_text(%) {
+    my %args = %{$_[0]};
+    my $section;
+
+    print "\n";
+    foreach $section (@{$args{'sectionlist'}}) {
+       print "$section:\n\n";
+       output_highlight($args{'sections'}{$section});
+    }
+    print "\n\n";
+}
+
+# output enum in text
+sub output_enum_text(%) {
+    my %args = %{$_[0]};
+    my ($parameter);
+    my $count;
+    print "Enum:\n\n";
+
+    print "enum " . $args{'enum'} . " - " . $args{'purpose'} . "\n\n";
+    print "enum " . $args{'enum'} . " {\n";
+    $count = 0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       print "\t$parameter";
+       if ($count != $#{$args{'parameterlist'}}) {
+           $count++;
+           print ",";
+       }
+       print "\n";
+    }
+    print "};\n\n";
+
+    print "Constants:\n\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       print "$parameter\n\t";
+       print $args{'parameterdescs'}{$parameter} . "\n";
+    }
+
+    output_section_text(@_);
+}
+
+# output typedef in text
+sub output_typedef_text(%) {
+    my %args = %{$_[0]};
+    my ($parameter);
+    my $count;
+    print "Typedef:\n\n";
+
+    print "typedef " . $args{'typedef'} . " - " . $args{'purpose'} . "\n";
+    output_section_text(@_);
+}
+
+# output struct as text
+sub output_struct_text(%) {
+    my %args = %{$_[0]};
+    my ($parameter);
+
+    print $args{'type'} . " " . $args{'struct'} . " - " . $args{'purpose'} . "\n\n";
+    print $args{'type'} . " " . $args{'struct'} . " {\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       if ($parameter =~ /^#/) {
+           print "$parameter\n";
+           next;
+       }
+
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+       $type = $args{'parametertypes'}{$parameter};
+       if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
+           # pointer-to-function
+           print "\t$1 $parameter) ($2);\n";
+       } elsif ($type =~ m/^(.*?)\s*(:.*)/) {
+           # bitfield
+           print "\t$1 $parameter$2;\n";
+       } else {
+           print "\t" . $type . " " . $parameter . ";\n";
+       }
+    }
+    print "};\n\n";
+
+    print "Members:\n\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+       ($parameter =~ /^#/) && next;
+
+       my $parameter_name = $parameter;
+       $parameter_name =~ s/\[.*//;
+
+       ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
+       print "$parameter\n\t";
+       print $args{'parameterdescs'}{$parameter_name} . "\n";
+    }
+    print "\n";
+    output_section_text(@_);
+}
+
+sub output_blockhead_text(%) {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+
+    foreach $section (@{$args{'sectionlist'}}) {
+       print " $section:\n";
+       print "    -> ";
+       output_highlight($args{'sections'}{$section});
+    }
+}
+
+##
+# generic output function for all types (function, struct/union, typedef, enum);
+# calls the generated, variable output_ function name based on
+# functype and output_mode
+sub output_declaration {
+    no strict 'refs';
+    my $name = shift;
+    my $functype = shift;
+    my $func = "output_${functype}_$output_mode";
+    if (($function_only==0) ||
+       ( $function_only == 1 && defined($function_table{$name})) ||
+       ( $function_only == 2 && !defined($function_table{$name})))
+    {
+       &$func(@_);
+       $section_counter++;
+    }
+}
+
+##
+# generic output function - calls the right one based on current output mode.
+sub output_blockhead {
+    no strict 'refs';
+    my $func = "output_blockhead_" . $output_mode;
+    &$func(@_);
+    $section_counter++;
+}
+
+##
+# takes a declaration (struct, union, enum, typedef) and
+# invokes the right handler. NOT called for functions.
+sub dump_declaration($$) {
+    no strict 'refs';
+    my ($prototype, $file) = @_;
+    my $func = "dump_" . $decl_type;
+    &$func(@_);
+}
+
+sub dump_union($$) {
+    dump_struct(@_);
+}
+
+sub dump_struct($$) {
+    my $x = shift;
+    my $file = shift;
+    my $nested;
+
+    if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) {
+       #my $decl_type = $1;
+       $declaration_name = $2;
+       my $members = $3;
+
+       # ignore embedded structs or unions
+       $members =~ s/({.*})//g;
+       $nested = $1;
+
+       # ignore members marked private:
+       $members =~ s/\/\*\s*private:.*?\/\*\s*public:.*?\*\///gos;
+       $members =~ s/\/\*\s*private:.*//gos;
+       # strip comments:
+       $members =~ s/\/\*.*?\*\///gos;
+       $nested =~ s/\/\*.*?\*\///gos;
+       # strip kmemcheck_bitfield_{begin,end}.*;
+       $members =~ s/kmemcheck_bitfield_.*?;//gos;
+
+       create_parameterlist($members, ';', $file);
+       check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);
+
+       output_declaration($declaration_name,
+                          'struct',
+                          {'struct' => $declaration_name,
+                           'module' => $modulename,
+                           'parameterlist' => \@parameterlist,
+                           'parameterdescs' => \%parameterdescs,
+                           'parametertypes' => \%parametertypes,
+                           'sectionlist' => \@sectionlist,
+                           'sections' => \%sections,
+                           'purpose' => $declaration_purpose,
+                           'type' => $decl_type
+                          });
+    }
+    else {
+       print STDERR "Error(${file}:$.): Cannot parse struct or union!\n";
+       ++$errors;
+    }
+}
+
+sub dump_enum($$) {
+    my $x = shift;
+    my $file = shift;
+
+    $x =~ s@/\*.*?\*/@@gos;    # strip comments.
+    if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
+       $declaration_name = $1;
+       my $members = $2;
+
+       foreach my $arg (split ',', $members) {
+           $arg =~ s/^\s*(\w+).*/$1/;
+           push @parameterlist, $arg;
+           if (!$parameterdescs{$arg}) {
+               $parameterdescs{$arg} = $undescribed;
+               print STDERR "Warning(${file}:$.): Enum value '$arg' ".
+                   "not described in enum '$declaration_name'\n";
+           }
+
+       }
+
+       output_declaration($declaration_name,
+                          'enum',
+                          {'enum' => $declaration_name,
+                           'module' => $modulename,
+                           'parameterlist' => \@parameterlist,
+                           'parameterdescs' => \%parameterdescs,
+                           'sectionlist' => \@sectionlist,
+                           'sections' => \%sections,
+                           'purpose' => $declaration_purpose
+                          });
+    }
+    else {
+       print STDERR "Error(${file}:$.): Cannot parse enum!\n";
+       ++$errors;
+    }
+}
+
+sub dump_typedef($$) {
+    my $x = shift;
+    my $file = shift;
+
+    $x =~ s@/\*.*?\*/@@gos;    # strip comments.
+    while (($x =~ /\(*.\)\s*;$/) || ($x =~ /\[*.\]\s*;$/)) {
+       $x =~ s/\(*.\)\s*;$/;/;
+       $x =~ s/\[*.\]\s*;$/;/;
+    }
+
+    if ($x =~ /typedef.*\s+(\w+)\s*;/) {
+       $declaration_name = $1;
+
+       output_declaration($declaration_name,
+                          'typedef',
+                          {'typedef' => $declaration_name,
+                           'module' => $modulename,
+                           'sectionlist' => \@sectionlist,
+                           'sections' => \%sections,
+                           'purpose' => $declaration_purpose
+                          });
+    }
+    else {
+       print STDERR "Error(${file}:$.): Cannot parse typedef!\n";
+       ++$errors;
+    }
+}
+
+sub save_struct_actual($) {
+    my $actual = shift;
+
+    # strip all spaces from the actual param so that it looks like one string item
+    $actual =~ s/\s*//g;
+    $struct_actual = $struct_actual . $actual . " ";
+}
+
+sub create_parameterlist($$$) {
+    my $args = shift;
+    my $splitter = shift;
+    my $file = shift;
+    my $type;
+    my $param;
+
+    # temporarily replace commas inside function pointer definition
+    while ($args =~ /(\([^\),]+),/) {
+       $args =~ s/(\([^\),]+),/$1#/g;
+    }
+
+    foreach my $arg (split($splitter, $args)) {
+       # strip comments
+       $arg =~ s/\/\*.*\*\///;
+       # strip leading/trailing spaces
+       $arg =~ s/^\s*//;
+       $arg =~ s/\s*$//;
+       $arg =~ s/\s+/ /;
+
+       if ($arg =~ /^#/) {
+           # Treat preprocessor directive as a typeless variable just to fill
+           # corresponding data structures "correctly". Catch it later in
+           # output_* subs.
+           push_parameter($arg, "", $file);
+       } elsif ($arg =~ m/\(.+\)\s*\(/) {
+           # pointer-to-function
+           $arg =~ tr/#/,/;
+           $arg =~ m/[^\(]+\(\*?\s*(\w*)\s*\)/;
+           $param = $1;
+           $type = $arg;
+           $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
+           save_struct_actual($param);
+           push_parameter($param, $type, $file);
+       } elsif ($arg) {
+           $arg =~ s/\s*:\s*/:/g;
+           $arg =~ s/\s*\[/\[/g;
+
+           my @args = split('\s*,\s*', $arg);
+           if ($args[0] =~ m/\*/) {
+               $args[0] =~ s/(\*+)\s*/ $1/;
+           }
+
+           my @first_arg;
+           if ($args[0] =~ /^(.*\s+)(.*?\[.*\].*)$/) {
+                   shift @args;
+                   push(@first_arg, split('\s+', $1));
+                   push(@first_arg, $2);
+           } else {
+                   @first_arg = split('\s+', shift @args);
+           }
+
+           unshift(@args, pop @first_arg);
+           $type = join " ", @first_arg;
+
+           foreach $param (@args) {
+               if ($param =~ m/^(\*+)\s*(.*)/) {
+                   save_struct_actual($2);
+                   push_parameter($2, "$type $1", $file);
+               }
+               elsif ($param =~ m/(.*?):(\d+)/) {
+                   if ($type ne "") { # skip unnamed bit-fields
+                       save_struct_actual($1);
+                       push_parameter($1, "$type:$2", $file)
+                   }
+               }
+               else {
+                   save_struct_actual($param);
+                   push_parameter($param, $type, $file);
+               }
+           }
+       }
+    }
+}
+
+sub push_parameter($$$) {
+       my $param = shift;
+       my $type = shift;
+       my $file = shift;
+
+       if (($anon_struct_union == 1) && ($type eq "") &&
+           ($param eq "}")) {
+               return;         # ignore the ending }; from anon. struct/union
+       }
+
+       $anon_struct_union = 0;
+       my $param_name = $param;
+       $param_name =~ s/\[.*//;
+
+       if ($type eq "" && $param =~ /\.\.\.$/)
+       {
+           if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") {
+               $parameterdescs{$param} = "variable arguments";
+           }
+       }
+       elsif ($type eq "" && ($param eq "" or $param eq "void"))
+       {
+           $param="void";
+           $parameterdescs{void} = "no arguments";
+       }
+       elsif ($type eq "" && ($param eq "struct" or $param eq "union"))
+       # handle unnamed (anonymous) union or struct:
+       {
+               $type = $param;
+               $param = "{unnamed_" . $param . "}";
+               $parameterdescs{$param} = "anonymous\n";
+               $anon_struct_union = 1;
+       }
+
+       # warn if parameter has no description
+       # (but ignore ones starting with # as these are not parameters
+       # but inline preprocessor statements);
+       # also ignore unnamed structs/unions;
+       if (!$anon_struct_union) {
+       if (!defined $parameterdescs{$param_name} && $param_name !~ /^#/) {
+
+           $parameterdescs{$param_name} = $undescribed;
+
+           if (($type eq 'function') || ($type eq 'enum')) {
+               print STDERR "Warning(${file}:$.): Function parameter ".
+                   "or member '$param' not " .
+                   "described in '$declaration_name'\n";
+           }
+           print STDERR "Warning(${file}:$.):" .
+                        " No description found for parameter '$param'\n";
+           ++$warnings;
+       }
+       }
+
+       # strip spaces from $param so that it is one continous string
+       # on @parameterlist;
+       # this fixes a problem where check_sections() cannot find
+       # a parameter like "addr[6 + 2]" because it actually appears
+       # as "addr[6", "+", "2]" on the parameter list;
+       # but it's better to maintain the param string unchanged for output,
+       # so just weaken the string compare in check_sections() to ignore
+       # "[blah" in a parameter string;
+       ###$param =~ s/\s*//g;
+       push @parameterlist, $param;
+       $parametertypes{$param} = $type;
+}
+
+sub check_sections($$$$$$) {
+       my ($file, $decl_name, $decl_type, $sectcheck, $prmscheck, $nested) = @_;
+       my @sects = split ' ', $sectcheck;
+       my @prms = split ' ', $prmscheck;
+       my $err;
+       my ($px, $sx);
+       my $prm_clean;          # strip trailing "[array size]" and/or beginning "*"
+
+       foreach $sx (0 .. $#sects) {
+               $err = 1;
+               foreach $px (0 .. $#prms) {
+                       $prm_clean = $prms[$px];
+                       $prm_clean =~ s/\[.*\]//;
+                       $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//;
+                       # ignore array size in a parameter string;
+                       # however, the original param string may contain
+                       # spaces, e.g.:  addr[6 + 2]
+                       # and this appears in @prms as "addr[6" since the
+                       # parameter list is split at spaces;
+                       # hence just ignore "[..." for the sections check;
+                       $prm_clean =~ s/\[.*//;
+
+                       ##$prm_clean =~ s/^\**//;
+                       if ($prm_clean eq $sects[$sx]) {
+                               $err = 0;
+                               last;
+                       }
+               }
+               if ($err) {
+                       if ($decl_type eq "function") {
+                               print STDERR "Warning(${file}:$.): " .
+                                       "Excess function parameter " .
+                                       "'$sects[$sx]' " .
+                                       "description in '$decl_name'\n";
+                               ++$warnings;
+                       } else {
+                               if ($nested !~ m/\Q$sects[$sx]\E/) {
+                                   print STDERR "Warning(${file}:$.): " .
+                                       "Excess struct/union/enum/typedef member " .
+                                       "'$sects[$sx]' " .
+                                       "description in '$decl_name'\n";
+                                   ++$warnings;
+                               }
+                       }
+               }
+       }
+}
+
+##
+# takes a function prototype and the name of the current file being
+# processed and spits out all the details stored in the global
+# arrays/hashes.
+sub dump_function($$) {
+    my $prototype = shift;
+    my $file = shift;
+
+    $prototype =~ s/^static +//;
+    $prototype =~ s/^extern +//;
+    $prototype =~ s/^asmlinkage +//;
+    $prototype =~ s/^inline +//;
+    $prototype =~ s/^__inline__ +//;
+    $prototype =~ s/^__inline +//;
+    $prototype =~ s/^__always_inline +//;
+    $prototype =~ s/^noinline +//;
+    $prototype =~ s/__devinit +//;
+    $prototype =~ s/__init +//;
+    $prototype =~ s/^#\s*define\s+//; #ak added
+    $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;
+
+    # Yes, this truly is vile.  We are looking for:
+    # 1. Return type (may be nothing if we're looking at a macro)
+    # 2. Function name
+    # 3. Function parameters.
+    #
+    # All the while we have to watch out for function pointer parameters
+    # (which IIRC is what the two sections are for), C types (these
+    # regexps don't even start to express all the possibilities), and
+    # so on.
+    #
+    # If you mess with these regexps, it's a good idea to check that
+    # the following functions' documentation still comes out right:
+    # - parport_register_device (function pointer parameters)
+    # - atomic_set (macro)
+    # - pci_match_device, __copy_to_user (long return type)
+
+    if ($prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+       $prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+       $prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s*\*+)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+       $prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s+\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ ||
+       $prototype =~ m/^(\w+\s+\w+\s*\*\s*\w+\s*\*\s*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/)  {
+       $return_type = $1;
+       $declaration_name = $2;
+       my $args = $3;
+
+       create_parameterlist($args, ',', $file);
+    } else {
+       print STDERR "Error(${file}:$.): cannot understand prototype: '$prototype'\n";
+       ++$errors;
+       return;
+    }
+
+       my $prms = join " ", @parameterlist;
+       check_sections($file, $declaration_name, "function", $sectcheck, $prms, "");
+
+    output_declaration($declaration_name,
+                      'function',
+                      {'function' => $declaration_name,
+                       'module' => $modulename,
+                       'functiontype' => $return_type,
+                       'parameterlist' => \@parameterlist,
+                       'parameterdescs' => \%parameterdescs,
+                       'parametertypes' => \%parametertypes,
+                       'sectionlist' => \@sectionlist,
+                       'sections' => \%sections,
+                       'purpose' => $declaration_purpose
+                      });
+}
+
+sub process_file($);
+
+# Read the file that maps relative names to absolute names for
+# separate source and object directories and for shadow trees.
+if (open(SOURCE_MAP, "<.tmp_filelist.txt")) {
+       my ($relname, $absname);
+       while(<SOURCE_MAP>) {
+               chop();
+               ($relname, $absname) = (split())[0..1];
+               $relname =~ s:^/+::;
+               $source_map{$relname} = $absname;
+       }
+       close(SOURCE_MAP);
+}
+
+if ($filelist) {
+       open(FLIST,"<$filelist") or die "Can't open file list $filelist";
+       while(<FLIST>) {
+               chop;
+               process_file($_);
+       }
+}
+
+foreach (@ARGV) {
+    chomp;
+    process_file($_);
+}
+if ($verbose && $errors) {
+  print STDERR "$errors errors\n";
+}
+if ($verbose && $warnings) {
+  print STDERR "$warnings warnings\n";
+}
+
+exit($errors);
+
+sub reset_state {
+    $function = "";
+    %constants = ();
+    %parameterdescs = ();
+    %parametertypes = ();
+    @parameterlist = ();
+    %sections = ();
+    @sectionlist = ();
+    $sectcheck = "";
+    $struct_actual = "";
+    $prototype = "";
+
+    $state = 0;
+}
+
+sub tracepoint_munge($) {
+       my $file = shift;
+       my $tracepointname = 0;
+       my $tracepointargs = 0;
+
+       if ($prototype =~ m/TRACE_EVENT\((.*?),/) {
+               $tracepointname = $1;
+       }
+       if ($prototype =~ m/DEFINE_SINGLE_EVENT\((.*?),/) {
+               $tracepointname = $1;
+       }
+       if ($prototype =~ m/DEFINE_EVENT\((.*?),(.*?),/) {
+               $tracepointname = $2;
+       }
+       $tracepointname =~ s/^\s+//; #strip leading whitespace
+       if ($prototype =~ m/TP_PROTO\((.*?)\)/) {
+               $tracepointargs = $1;
+       }
+       if (($tracepointname eq 0) || ($tracepointargs eq 0)) {
+               print STDERR "Warning(${file}:$.): Unrecognized tracepoint format: \n".
+                            "$prototype\n";
+       } else {
+               $prototype = "static inline void trace_$tracepointname($tracepointargs)";
+       }
+}
+
+sub syscall_munge() {
+       my $void = 0;
+
+       $prototype =~ s@[\r\n\t]+@ @gos; # strip newlines/CR's/tabs
+##     if ($prototype =~ m/SYSCALL_DEFINE0\s*\(\s*(a-zA-Z0-9_)*\s*\)/) {
+       if ($prototype =~ m/SYSCALL_DEFINE0/) {
+               $void = 1;
+##             $prototype = "long sys_$1(void)";
+       }
+
+       $prototype =~ s/SYSCALL_DEFINE.*\(/long sys_/; # fix return type & func name
+       if ($prototype =~ m/long (sys_.*?),/) {
+               $prototype =~ s/,/\(/;
+       } elsif ($void) {
+               $prototype =~ s/\)/\(void\)/;
+       }
+
+       # now delete all of the odd-number commas in $prototype
+       # so that arg types & arg names don't have a comma between them
+       my $count = 0;
+       my $len = length($prototype);
+       if ($void) {
+               $len = 0;       # skip the for-loop
+       }
+       for (my $ix = 0; $ix < $len; $ix++) {
+               if (substr($prototype, $ix, 1) eq ',') {
+                       $count++;
+                       if ($count % 2 == 1) {
+                               substr($prototype, $ix, 1) = ' ';
+                       }
+               }
+       }
+}
+
+sub process_state3_function($$) {
+    my $x = shift;
+    my $file = shift;
+
+    $x =~ s@\/\/.*$@@gos; # strip C99-style comments to end of line
+
+    if ($x =~ m#\s*/\*\s+MACDOC\s*#io || ($x =~ /^#/ && $x !~ /^#\s*define/)) {
+       # do nothing
+    }
+    elsif ($x =~ /([^\{]*)/) {
+       $prototype .= $1;
+    }
+
+    if (($x =~ /\{/) || ($x =~ /\#\s*define/) || ($x =~ /;/)) {
+       $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
+       $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
+       $prototype =~ s@^\s+@@gos; # strip leading spaces
+       if ($prototype =~ /SYSCALL_DEFINE/) {
+               syscall_munge();
+       }
+       if ($prototype =~ /TRACE_EVENT/ || $prototype =~ /DEFINE_EVENT/ ||
+           $prototype =~ /DEFINE_SINGLE_EVENT/)
+       {
+               tracepoint_munge($file);
+       }
+       dump_function($prototype, $file);
+       reset_state();
+    }
+}
+
+sub process_state3_type($$) {
+    my $x = shift;
+    my $file = shift;
+
+    $x =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
+    $x =~ s@^\s+@@gos; # strip leading spaces
+    $x =~ s@\s+$@@gos; # strip trailing spaces
+    $x =~ s@\/\/.*$@@gos; # strip C99-style comments to end of line
+
+    if ($x =~ /^#/) {
+       # To distinguish preprocessor directive from regular declaration later.
+       $x .= ";";
+    }
+
+    while (1) {
+       if ( $x =~ /([^{};]*)([{};])(.*)/ ) {
+           $prototype .= $1 . $2;
+           ($2 eq '{') && $brcount++;
+           ($2 eq '}') && $brcount--;
+           if (($2 eq ';') && ($brcount == 0)) {
+               dump_declaration($prototype, $file);
+               reset_state();
+               last;
+           }
+           $x = $3;
+       } else {
+           $prototype .= $x;
+           last;
+       }
+    }
+}
+
+# xml_escape: replace <, >, and & in the text stream;
+#
+# however, formatting controls that are generated internally/locally in the
+# kernel-doc script are not escaped here; instead, they begin life like
+# $blankline_html (4 of '\' followed by a mnemonic + ':'), then these strings
+# are converted to their mnemonic-expected output, without the 4 * '\' & ':',
+# just before actual output; (this is done by local_unescape())
+sub xml_escape($) {
+       my $text = shift;
+       if (($output_mode eq "text") || ($output_mode eq "man")) {
+               return $text;
+       }
+       $text =~ s/\&/\\\\\\amp;/g;
+       $text =~ s/\</\\\\\\lt;/g;
+       $text =~ s/\>/\\\\\\gt;/g;
+       return $text;
+}
+
+# convert local escape strings to html
+# local escape strings look like:  '\\\\menmonic:' (that's 4 backslashes)
+sub local_unescape($) {
+       my $text = shift;
+       if (($output_mode eq "text") || ($output_mode eq "man")) {
+               return $text;
+       }
+       $text =~ s/\\\\\\\\lt:/</g;
+       $text =~ s/\\\\\\\\gt:/>/g;
+       return $text;
+}
+
+sub process_file($) {
+    my $file;
+    my $identifier;
+    my $func;
+    my $descr;
+    my $in_purpose = 0;
+    my $initial_section_counter = $section_counter;
+
+    if (defined($ENV{'SRCTREE'})) {
+       $file = "$ENV{'SRCTREE'}" . "/" . "@_";
+    }
+    else {
+       $file = "@_";
+    }
+    if (defined($source_map{$file})) {
+       $file = $source_map{$file};
+    }
+
+    if (!open(IN,"<$file")) {
+       print STDERR "Error: Cannot open file $file\n";
+       ++$errors;
+       return;
+    }
+
+    $section_counter = 0;
+    while (<IN>) {
+       if ($state == 0) {
+           if (/$doc_start/o) {
+               $state = 1;             # next line is always the function name
+               $in_doc_sect = 0;
+           }
+       } elsif ($state == 1) { # this line is the function name (always)
+           if (/$doc_block/o) {
+               $state = 4;
+               $contents = "";
+               if ( $1 eq "" ) {
+                       $section = $section_intro;
+               } else {
+                       $section = $1;
+               }
+           }
+           elsif (/$doc_decl/o) {
+               $identifier = $1;
+               if (/\s*([\w\s]+?)\s*-/) {
+                   $identifier = $1;
+               }
+
+               $state = 2;
+               if (/-(.*)/) {
+                   # strip leading/trailing/multiple spaces
+                   $descr= $1;
+                   $descr =~ s/^\s*//;
+                   $descr =~ s/\s*$//;
+                   $descr =~ s/\s+/ /;
+                   $declaration_purpose = xml_escape($descr);
+                   $in_purpose = 1;
+               } else {
+                   $declaration_purpose = "";
+               }
+
+               if (($declaration_purpose eq "") && $verbose) {
+                       print STDERR "Warning(${file}:$.): missing initial short description on line:\n";
+                       print STDERR $_;
+                       ++$warnings;
+               }
+
+               if ($identifier =~ m/^struct/) {
+                   $decl_type = 'struct';
+               } elsif ($identifier =~ m/^union/) {
+                   $decl_type = 'union';
+               } elsif ($identifier =~ m/^enum/) {
+                   $decl_type = 'enum';
+               } elsif ($identifier =~ m/^typedef/) {
+                   $decl_type = 'typedef';
+               } else {
+                   $decl_type = 'function';
+               }
+
+               if ($verbose) {
+                   print STDERR "Info(${file}:$.): Scanning doc for $identifier\n";
+               }
+           } else {
+               print STDERR "Warning(${file}:$.): Cannot understand $_ on line $.",
+               " - I thought it was a doc line\n";
+               ++$warnings;
+               $state = 0;
+           }
+       } elsif ($state == 2) { # look for head: lines, and include content
+           if (/$doc_sect/o) {
+               $newsection = $1;
+               $newcontents = $2;
+
+               if (($contents ne "") && ($contents ne "\n")) {
+                   if (!$in_doc_sect && $verbose) {
+                       print STDERR "Warning(${file}:$.): contents before sections\n";
+                       ++$warnings;
+                   }
+                   dump_section($file, $section, xml_escape($contents));
+                   $section = $section_default;
+               }
+
+               $in_doc_sect = 1;
+               $in_purpose = 0;
+               $contents = $newcontents;
+               if ($contents ne "") {
+                   while ((substr($contents, 0, 1) eq " ") ||
+                       substr($contents, 0, 1) eq "\t") {
+                           $contents = substr($contents, 1);
+                   }
+                   $contents .= "\n";
+               }
+               $section = $newsection;
+           } elsif (/$doc_end/) {
+
+               if ($contents ne "") {
+                   dump_section($file, $section, xml_escape($contents));
+                   $section = $section_default;
+                   $contents = "";
+               }
+               # look for doc_com + <text> + doc_end:
+               if ($_ =~ m'\s*\*\s*[a-zA-Z_0-9:\.]+\*/') {
+                   print STDERR "Warning(${file}:$.): suspicious ending line: $_";
+                   ++$warnings;
+               }
+
+               $prototype = "";
+               $state = 3;
+               $brcount = 0;
+#              print STDERR "end of doc comment, looking for prototype\n";
+           } elsif (/$doc_content/) {
+               # miguel-style comment kludge, look for blank lines after
+               # @parameter line to signify start of description
+               if ($1 eq "") {
+                   if ($section =~ m/^@/ || $section eq $section_context) {
+                       dump_section($file, $section, xml_escape($contents));
+                       $section = $section_default;
+                       $contents = "";
+                   } else {
+                       $contents .= "\n";
+                   }
+                   $in_purpose = 0;
+               } elsif ($in_purpose == 1) {
+                   # Continued declaration purpose
+                   chomp($declaration_purpose);
+                   $declaration_purpose .= " " . xml_escape($1);
+               } else {
+                   $contents .= $1 . "\n";
+               }
+           } else {
+               # i dont know - bad line?  ignore.
+               print STDERR "Warning(${file}:$.): bad line: $_";
+               ++$warnings;
+           }
+       } elsif ($state == 3) { # scanning for function '{' (end of prototype)
+           if ($decl_type eq 'function') {
+               process_state3_function($_, $file);
+           } else {
+               process_state3_type($_, $file);
+           }
+       } elsif ($state == 4) {
+               # Documentation block
+               if (/$doc_block/) {
+                       dump_doc_section($file, $section, xml_escape($contents));
+                       $contents = "";
+                       $function = "";
+                       %constants = ();
+                       %parameterdescs = ();
+                       %parametertypes = ();
+                       @parameterlist = ();
+                       %sections = ();
+                       @sectionlist = ();
+                       $prototype = "";
+                       if ( $1 eq "" ) {
+                               $section = $section_intro;
+                       } else {
+                               $section = $1;
+                       }
+               }
+               elsif (/$doc_end/)
+               {
+                       dump_doc_section($file, $section, xml_escape($contents));
+                       $contents = "";
+                       $function = "";
+                       %constants = ();
+                       %parameterdescs = ();
+                       %parametertypes = ();
+                       @parameterlist = ();
+                       %sections = ();
+                       @sectionlist = ();
+                       $prototype = "";
+                       $state = 0;
+               }
+               elsif (/$doc_content/)
+               {
+                       if ( $1 eq "" )
+                       {
+                               $contents .= $blankline;
+                       }
+                       else
+                       {
+                               $contents .= $1 . "\n";
+                       }
+               }
+       }
+    }
+    if ($initial_section_counter == $section_counter) {
+       print STDERR "Warning(${file}): no structured comments found\n";
+       if ($output_mode eq "xml") {
+           # The template wants at least one RefEntry here; make one.
+           print "<refentry>\n";
+           print " <refnamediv>\n";
+           print "  <refname>\n";
+           print "   ${file}\n";
+           print "  </refname>\n";
+           print "  <refpurpose>\n";
+           print "   Document generation inconsistency\n";
+           print "  </refpurpose>\n";
+           print " </refnamediv>\n";
+           print " <refsect1>\n";
+           print "  <title>\n";
+           print "   Oops\n";
+           print "  </title>\n";
+           print "  <warning>\n";
+           print "   <para>\n";
+           print "    The template for this document tried to insert\n";
+           print "    the structured comment from the file\n";
+           print "    <filename>${file}</filename> at this point,\n";
+           print "    but none was found.\n";
+           print "    This dummy section is inserted to allow\n";
+           print "    generation to continue.\n";
+           print "   </para>\n";
+           print "  </warning>\n";
+           print " </refsect1>\n";
+           print "</refentry>\n";
+       }
+    }
+}
diff --git a/test-server/.gitignore b/test-server/.gitignore
new file mode 100644 (file)
index 0000000..53ba6cb
--- /dev/null
@@ -0,0 +1,9 @@
+#Ignore build files
+libwebsockets-test-*
+Makefile
+*.o
+*.lo
+*.la
+.libs
+.deps
+
diff --git a/test-server/Makefile.am b/test-server/Makefile.am
new file mode 100644 (file)
index 0000000..b08460d
--- /dev/null
@@ -0,0 +1,131 @@
+bin_PROGRAMS=libwebsockets-test-echo
+libwebsockets_test_echo_SOURCES=test-echo.c
+libwebsockets_test_echo_CFLAGS= -Wall -Werror -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\"
+libwebsockets_test_echo_LDADD=-L../lib -lwebsockets
+
+if NO_CLIENT
+else
+bin_PROGRAMS+= libwebsockets-test-client
+if NO_SERVER
+else
+bin_PROGRAMS+= libwebsockets-test-fraggle
+endif
+endif
+
+if NO_SERVER
+else
+bin_PROGRAMS+=libwebsockets-test-server libwebsockets-test-server-extpoll
+endif
+
+if NO_SERVER
+else
+libwebsockets_test_server_SOURCES=test-server.c
+libwebsockets_test_server_CFLAGS=
+libwebsockets_test_server_LDADD=-L../lib -lwebsockets
+libwebsockets_test_server_extpoll_SOURCES=test-server.c
+libwebsockets_test_server_extpoll_CFLAGS=$(AM_CFLAGS) -DEXTERNAL_POLL
+libwebsockets_test_server_extpoll_LDADD=-L../lib -lwebsockets
+endif
+if NO_CLIENT
+else
+libwebsockets_test_client_SOURCES=test-client.c
+libwebsockets_test_client_CFLAGS=
+libwebsockets_test_client_LDADD=-L../lib -lwebsockets
+if NO_SERVER
+else
+libwebsockets_test_fraggle_SOURCES=test-fraggle.c
+libwebsockets_test_fraggle_CFLAGS=
+libwebsockets_test_fraggle_LDADD=-L../lib -lwebsockets
+endif
+endif
+
+if MINGW
+if NO_SERVER
+else
+libwebsockets_test_server_CFLAGS+= -w  -I../win32port/win32helpers
+libwebsockets_test_server_extpoll_CFLAGS+= -w  -I../win32port/win32helpers
+endif
+if NO_CLIENT
+else
+libwebsockets_test_client_CFLAGS+= -w   -I../win32port/win32helpers
+if NO_SERVER
+else
+libwebsockets_test_fraggle_CFLAGS+= -w   -I../win32port/win32helpers
+endif
+endif
+
+if NO_SERVER
+else
+libwebsockets_test_server_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz
+libwebsockets_test_server_extpoll_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz
+endif
+if NO_CLIENT
+else
+libwebsockets_test_client_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz 
+if NO_SERVER
+else
+libwebsockets_test_fraggle_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz
+endif
+endif
+
+else
+if NO_SERVER
+else
+libwebsockets_test_server_CFLAGS+= -Werror
+libwebsockets_test_server_extpoll_CFLAGS+= -Werror
+endif
+if NO_CLIENT
+else
+libwebsockets_test_client_CFLAGS+= -Werror
+if NO_SERVER
+else
+libwebsockets_test_fraggle_CFLAGS+= -Werror
+endif
+endif
+endif   
+
+if NO_SERVER
+else
+libwebsockets_test_server_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
+libwebsockets_test_server_extpoll_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
+endif
+if NO_CLIENT
+else
+libwebsockets_test_client_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
+if NO_SERVER
+else
+libwebsockets_test_fraggle_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
+endif
+endif
+
+if NOPING
+else
+if NO_CLIENT
+else
+bin_PROGRAMS+=libwebsockets-test-ping
+libwebsockets_test_ping_SOURCES=test-ping.c
+libwebsockets_test_ping_LDADD=-L../lib -lwebsockets
+libwebsockets_test_ping_CFLAGS= -Wall -Werror -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
+endif
+endif
+
+EXTRA_DIST=test.html favicon.ico libwebsockets.org-logo.png leaf.jpg
+
+#
+# cook a random test cert and key
+# notice your real cert and key will want to be 0600 permissions
+libwebsockets-test-server.pem libwebsockets-test-server.key.pem:
+       printf "GB\nErewhon\nAll around\nlibwebsockets-test\n\nlocalhost\nnone@invalid.org\n" | \
+       openssl req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout \
+       ./libwebsockets-test-server.key.pem -out ./libwebsockets-test-server.pem >/dev/null 2>&1  && \
+       chmod 644       ./libwebsockets-test-server.key.pem \
+                       ./libwebsockets-test-server.pem
+
+clean-local:
+       rm -f ./libwebsockets-test-server.key.pem ./libwebsockets-test-server.pem
+
+install-data-local:libwebsockets-test-server.key.pem libwebsockets-test-server.pem
+       mkdir -p $(DESTDIR)$(datadir)/libwebsockets-test-server
+       cp -a $(EXTRA_DIST) libwebsockets-test-server.key.pem libwebsockets-test-server.pem \
+               $(DESTDIR)$(datadir)/libwebsockets-test-server
+
diff --git a/test-server/attack.sh b/test-server/attack.sh
new file mode 100755 (executable)
index 0000000..dae2c2a
--- /dev/null
@@ -0,0 +1,148 @@
+#!/bin/sh
+#
+# attack the test server and try to make it fall over
+#
+SERVER=127.0.0.1
+PORT=7681
+LOG=/tmp/lwslog
+
+CPID=
+LEN=0
+
+function check {
+       kill -0 $CPID
+       if [ $? -ne 0 ] ; then
+               echo "(killed it) *******"
+               exit 1
+       fi
+       dd if=$LOG bs=1 skip=$LEN 2>/dev/null
+       LEN=`stat $LOG -c %s`
+}
+
+
+rm -rf $LOG
+killall libwebsockets-test-server 2>/dev/null
+libwebsockets-test-server -d31 2>> $LOG &
+CPID=$!
+
+while [ -z "`grep Listening $LOG`" ] ; do
+       sleep 0.5s
+done
+check
+
+echo
+echo "---- spam enough crap to not be GET"
+echo "not GET" | nc $SERVER $PORT
+check
+
+echo
+echo "---- spam more than the name buffer of crap"
+dd if=/dev/urandom bs=1 count=80 2>/dev/null | nc -i1s $SERVER $PORT
+check
+
+echo
+echo "---- spam 10MB of crap"
+dd if=/dev/urandom bs=1 count=655360 | nc -i1s $SERVER $PORT
+check
+
+echo
+echo "---- malformed URI"
+echo "GET nonsense................................................................................................................" \
+       | nc -i1s $SERVER $PORT
+check
+
+echo
+echo "---- missing URI"
+echo -e "GET HTTP/1.1\x0d\x0a\x0d\x0a" | nc -i1s $SERVER $PORT >/tmp/lwscap
+check
+
+echo
+echo "---- repeated method"
+echo -e "GET blah HTTP/1.1\x0d\x0aGET blah HTTP/1.1\x0d\x0a\x0d\x0a" | nc $SERVER $PORT >/tmp/lwscap 
+check
+
+echo
+echo "---- crazy header name part"
+echo -e "GET blah HTTP/1.1\x0d\x0a................................................................................................................" \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+ | nc -i1s $SERVER $PORT
+check
+
+echo
+echo "---- excessive uri content"
+echo -e "GET ................................................................................................................" \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+ | nc -i1s $SERVER $PORT
+check
+
+echo
+echo "---- good request but http payload coming too (should be ignored and test.html served)"
+echo -e "GET blah HTTP/1.1\x0d\x0a\x0d\x0aILLEGAL-PAYLOAD........................................" \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+       "......................................................................................................................." \
+        | nc $SERVER $PORT | sed '1,/^\r$/d'> /tmp/lwscap
+check
+diff /tmp/lwscap /usr/share/libwebsockets-test-server/test.html > /dev/null
+if [ $? -ne 0 ] ; then
+       echo "FAIL: got something other than test.html back"
+       exit 1
+fi
+
+echo
+echo "---- directory attack"
+rm -f /tmp/lwscap
+echo -e "GET ../../../../etc/passwd HTTP/1.1\x0d\x0a\x0d\x0a" | nc $SERVER $PORT | sed '1,/^\r$/d'> /tmp/lwscap
+check
+diff /tmp/lwscap /usr/share/libwebsockets-test-server/test.html > /dev/null
+if [ $? -ne 0 ] ; then
+       echo "FAIL: got something other than test.html back"
+       exit 1
+fi
+
+echo
+echo "--- survived"
+kill -2 $CPID
+
diff --git a/test-server/favicon.ico b/test-server/favicon.ico
new file mode 100644 (file)
index 0000000..c0cc2e3
Binary files /dev/null and b/test-server/favicon.ico differ
diff --git a/test-server/leaf.jpg b/test-server/leaf.jpg
new file mode 100644 (file)
index 0000000..1a3f46b
Binary files /dev/null and b/test-server/leaf.jpg differ
diff --git a/test-server/libwebsockets.org-logo.png b/test-server/libwebsockets.org-logo.png
new file mode 100644 (file)
index 0000000..2060a10
Binary files /dev/null and b/test-server/libwebsockets.org-logo.png differ
diff --git a/test-server/test-client.c b/test-server/test-client.c
new file mode 100644 (file)
index 0000000..b602442
--- /dev/null
@@ -0,0 +1,370 @@
+/*
+ * libwebsockets-test-client - libwebsockets test implementation
+ *
+ * Copyright (C) 2011 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+#include <signal.h>
+
+#ifdef CMAKE_BUILD
+#include "lws_config.h"
+#endif
+
+#include "../lib/libwebsockets.h"
+
+static unsigned int opts;
+static int was_closed;
+static int deny_deflate;
+static int deny_mux;
+static struct libwebsocket *wsi_mirror;
+static int mirror_lifetime = 0;
+static int force_exit = 0;
+
+/*
+ * This demo shows how to connect multiple websockets simultaneously to a
+ * websocket server (there is no restriction on their having to be the same
+ * server just it simplifies the demo).
+ *
+ *  dumb-increment-protocol:  we connect to the server and print the number
+ *                             we are given
+ *
+ *  lws-mirror-protocol: draws random circles, which are mirrored on to every
+ *                             client (see them being drawn in every browser
+ *                             session also using the test server)
+ */
+
+enum demo_protocols {
+
+       PROTOCOL_DUMB_INCREMENT,
+       PROTOCOL_LWS_MIRROR,
+
+       /* always last */
+       DEMO_PROTOCOL_COUNT
+};
+
+
+/* dumb_increment protocol */
+
+static int
+callback_dumb_increment(struct libwebsocket_context *this,
+                       struct libwebsocket *wsi,
+                       enum libwebsocket_callback_reasons reason,
+                                              void *user, void *in, size_t len)
+{
+       switch (reason) {
+
+       case LWS_CALLBACK_CLOSED:
+               fprintf(stderr, "LWS_CALLBACK_CLOSED\n");
+               was_closed = 1;
+               break;
+
+       case LWS_CALLBACK_CLIENT_RECEIVE:
+               ((char *)in)[len] = '\0';
+               fprintf(stderr, "rx %d '%s'\n", (int)len, (char *)in);
+               break;
+
+       /* because we are protocols[0] ... */
+
+       case LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED:
+               if ((strcmp(in, "deflate-stream") == 0) && deny_deflate) {
+                       fprintf(stderr, "denied deflate-stream extension\n");
+                       return 1;
+               }
+               if ((strcmp(in, "x-google-mux") == 0) && deny_mux) {
+                       fprintf(stderr, "denied x-google-mux extension\n");
+                       return 1;
+               }
+
+               break;
+
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+
+/* lws-mirror_protocol */
+
+
+static int
+callback_lws_mirror(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi,
+                       enum libwebsocket_callback_reasons reason,
+                                              void *user, void *in, size_t len)
+{
+       unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 4096 +
+                                                 LWS_SEND_BUFFER_POST_PADDING];
+       int l = 0;
+       int n;
+
+       switch (reason) {
+
+       case LWS_CALLBACK_CLOSED:
+               fprintf(stderr, "mirror: LWS_CALLBACK_CLOSED\n");
+               wsi_mirror = NULL;
+               break;
+
+       case LWS_CALLBACK_CLIENT_ESTABLISHED:
+
+               /*
+                * start the ball rolling,
+                * LWS_CALLBACK_CLIENT_WRITEABLE will come next service
+                */
+
+               libwebsocket_callback_on_writable(context, wsi);
+               break;
+
+       case LWS_CALLBACK_CLIENT_RECEIVE:
+/*             fprintf(stderr, "rx %d '%s'\n", (int)len, (char *)in); */
+               break;
+
+       case LWS_CALLBACK_CLIENT_WRITEABLE:
+
+               for (n = 0; n < 1; n++)
+                       l += sprintf((char *)&buf[LWS_SEND_BUFFER_PRE_PADDING + l],
+                                       "c #%06X %d %d %d;",
+                                       (int)random() & 0xffffff,
+                                       (int)random() % 500,
+                                       (int)random() % 250,
+                                       (int)random() % 24);
+
+               n = libwebsocket_write(wsi,
+                  &buf[LWS_SEND_BUFFER_PRE_PADDING], l, opts | LWS_WRITE_TEXT);
+
+               if (n < 0)
+                       return -1;
+               if (n < l) {
+                       lwsl_err("Partial write LWS_CALLBACK_CLIENT_WRITEABLE\n");
+                       return -1;
+               }
+
+               mirror_lifetime--;
+               if (!mirror_lifetime) {
+                       fprintf(stderr, "closing mirror session\n");
+                       return -1;
+               } else
+                       /* get notified as soon as we can write again */
+                       libwebsocket_callback_on_writable(context, wsi);
+               break;
+
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+
+/* list of supported protocols and callbacks */
+
+static struct libwebsocket_protocols protocols[] = {
+       {
+               "dumb-increment-protocol",
+               callback_dumb_increment,
+               0,
+               20,
+       },
+       {
+               "lws-mirror-protocol",
+               callback_lws_mirror,
+               0,
+               128,
+       },
+       { NULL, NULL, 0, 0 } /* end */
+};
+
+void sighandler(int sig)
+{
+       force_exit = 1;
+}
+
+static struct option options[] = {
+       { "help",       no_argument,            NULL, 'h' },
+       { "debug",      required_argument,      NULL, 'd' },
+       { "port",       required_argument,      NULL, 'p' },
+       { "ssl",        no_argument,            NULL, 's' },
+       { "version",    required_argument,      NULL, 'v' },
+       { "undeflated", no_argument,            NULL, 'u' },
+       { "nomux",      no_argument,            NULL, 'n' },
+       { "longlived",  no_argument,            NULL, 'l' },
+       { NULL, 0, 0, 0 }
+};
+
+
+int main(int argc, char **argv)
+{
+       int n = 0;
+       int ret = 0;
+       int port = 7681;
+       int use_ssl = 0;
+       struct libwebsocket_context *context;
+       const char *address;
+       struct libwebsocket *wsi_dumb;
+       int ietf_version = -1; /* latest */
+       int longlived = 0;
+       struct lws_context_creation_info info;
+
+       memset(&info, 0, sizeof info);
+
+       fprintf(stderr, "libwebsockets test client\n"
+                       "(C) Copyright 2010-2013 Andy Green <andy@warmcat.com> "
+                                                   "licensed under LGPL2.1\n");
+
+       if (argc < 2)
+               goto usage;
+
+       while (n >= 0) {
+               n = getopt_long(argc, argv, "nuv:hsp:d:l", options, NULL);
+               if (n < 0)
+                       continue;
+               switch (n) {
+               case 'd':
+                       lws_set_log_level(atoi(optarg), NULL);
+                       break;
+               case 's':
+                       use_ssl = 2; /* 2 = allow selfsigned */
+                       break;
+               case 'p':
+                       port = atoi(optarg);
+                       break;
+               case 'l':
+                       longlived = 1;
+                       break;
+               case 'v':
+                       ietf_version = atoi(optarg);
+                       break;
+               case 'u':
+                       deny_deflate = 1;
+                       break;
+               case 'n':
+                       deny_mux = 1;
+                       break;
+               case 'h':
+                       goto usage;
+               }
+       }
+
+       if (optind >= argc)
+               goto usage;
+
+       signal(SIGINT, sighandler);
+
+       address = argv[optind];
+
+       /*
+        * create the websockets context.  This tracks open connections and
+        * knows how to route any traffic and which protocol version to use,
+        * and if each connection is client or server side.
+        *
+        * For this client-only demo, we tell it to not listen on any port.
+        */
+
+       info.port = CONTEXT_PORT_NO_LISTEN;
+       info.protocols = protocols;
+#ifndef LWS_NO_EXTENSIONS
+       info.extensions = libwebsocket_get_internal_extensions();
+#endif
+       info.gid = -1;
+       info.uid = -1;
+
+       context = libwebsocket_create_context(&info);
+       if (context == NULL) {
+               fprintf(stderr, "Creating libwebsocket context failed\n");
+               return 1;
+       }
+
+       /* create a client websocket using dumb increment protocol */
+
+       wsi_dumb = libwebsocket_client_connect(context, address, port, use_ssl,
+                       "/", argv[optind], argv[optind],
+                        protocols[PROTOCOL_DUMB_INCREMENT].name, ietf_version);
+
+       if (wsi_dumb == NULL) {
+               fprintf(stderr, "libwebsocket dumb connect failed\n");
+               ret = 1;
+               goto bail;
+       }
+
+       fprintf(stderr, "Websocket connections opened\n");
+
+       /*
+        * sit there servicing the websocket context to handle incoming
+        * packets, and drawing random circles on the mirror protocol websocket
+        */
+
+       n = 0;
+       while (n >= 0 && !was_closed && !force_exit) {
+               n = libwebsocket_service(context, 10);
+
+               if (n < 0)
+                       continue;
+
+               if (wsi_mirror)
+                       continue;
+
+               /* create a client websocket using mirror protocol */
+
+               wsi_mirror = libwebsocket_client_connect(context,
+                       address, port, use_ssl,  "/",
+                       argv[optind], argv[optind],
+                       protocols[PROTOCOL_LWS_MIRROR].name, ietf_version);
+
+               if (wsi_mirror == NULL) {
+                       fprintf(stderr, "libwebsocket "
+                                             "dumb connect failed\n");
+                       ret = 1;
+                       goto bail;
+               }
+
+               mirror_lifetime = 10 + (random() & 1023);
+               /* useful to test single connection stability */
+               if (longlived)
+                       mirror_lifetime += 50000;
+
+               fprintf(stderr, "opened mirror connection with "
+                                    "%d lifetime\n", mirror_lifetime);
+
+               /*
+                * mirror_lifetime is decremented each send, when it reaches
+                * zero the connection is closed in the send callback.
+                * When the close callback comes, wsi_mirror is set to NULL
+                * so a new connection will be opened
+                */
+       }
+
+bail:
+       fprintf(stderr, "Exiting\n");
+
+       libwebsocket_context_destroy(context);
+
+       return ret;
+
+usage:
+       fprintf(stderr, "Usage: libwebsockets-test-client "
+                               "<server address> [--port=<p>] "
+                               "[--ssl] [-k] [-v <ver>] "
+                               "[-d <log bitfield>] [-l]\n");
+       return 1;
+}
diff --git a/test-server/test-echo.c b/test-server/test-echo.c
new file mode 100644 (file)
index 0000000..d86d4d0
--- /dev/null
@@ -0,0 +1,347 @@
+/*
+ * libwebsockets-test-echo - libwebsockets echo test implementation
+ *
+ * This implements both the client and server sides.  It defaults to
+ * serving, use --client <remote address> to connect as client.
+ *
+ * Copyright (C) 2010-2013 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <syslog.h>
+#include <signal.h>
+
+#ifdef CMAKE_BUILD
+#include "lws_config.h"
+#endif
+
+#include "../lib/libwebsockets.h"
+
+int force_exit = 0;
+
+#define MAX_ECHO_PAYLOAD 1400
+#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server"
+
+struct per_session_data__echo {
+       unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + MAX_ECHO_PAYLOAD + LWS_SEND_BUFFER_POST_PADDING];
+       unsigned int len;
+       unsigned int index;
+};
+
+static int
+callback_echo(struct libwebsocket_context *context,
+               struct libwebsocket *wsi,
+               enum libwebsocket_callback_reasons reason, void *user,
+                                                          void *in, size_t len)
+{
+       struct per_session_data__echo *pss = (struct per_session_data__echo *)user;
+       int n;
+
+       switch (reason) {
+
+#ifndef LWS_NO_SERVER
+       /* when the callback is used for server operations --> */
+
+       case LWS_CALLBACK_SERVER_WRITEABLE:
+               n = libwebsocket_write(wsi, &pss->buf[LWS_SEND_BUFFER_PRE_PADDING], pss->len, LWS_WRITE_TEXT);
+               if (n < 0) {
+                       lwsl_err("ERROR %d writing to socket, hanging up\n", n);
+                       return 1;
+               }
+               if (n < pss->len) {
+                       lwsl_err("Partial write\n");
+                       return -1;
+               }
+               break;
+
+       case LWS_CALLBACK_RECEIVE:
+               if (len > MAX_ECHO_PAYLOAD) {
+                       lwsl_err("Server received packet bigger than %u, hanging up\n", MAX_ECHO_PAYLOAD);
+                       return 1;
+               }
+               memcpy(&pss->buf[LWS_SEND_BUFFER_PRE_PADDING], in, len);
+               pss->len = len;
+               libwebsocket_callback_on_writable(context, wsi);
+               break;
+#endif
+
+#ifndef LWS_NO_CLIENT
+       /* when the callback is used for client operations --> */
+
+       case LWS_CALLBACK_CLIENT_ESTABLISHED:
+               lwsl_notice("Client has connected\n");
+               pss->index = 0;
+               break;
+
+       case LWS_CALLBACK_CLIENT_RECEIVE:
+               lwsl_notice("Client RX: %s", (char *)in);
+               break;
+
+       case LWS_CALLBACK_CLIENT_WRITEABLE:
+               /* we will send our packet... */
+               pss->len = sprintf((char *)&pss->buf[LWS_SEND_BUFFER_PRE_PADDING], "hello from libwebsockets-test-echo client pid %d index %d\n", getpid(), pss->index++);
+               lwsl_notice("Client TX: %s", &pss->buf[LWS_SEND_BUFFER_PRE_PADDING]);
+               n = libwebsocket_write(wsi, &pss->buf[LWS_SEND_BUFFER_PRE_PADDING], pss->len, LWS_WRITE_TEXT);
+               if (n < 0) {
+                       lwsl_err("ERROR %d writing to socket, hanging up\n", n);
+                       return -1;
+               }
+               if (n < pss->len) {
+                       lwsl_err("Partial write\n");
+                       return -1;
+               }
+               break;
+#endif
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+
+
+static struct libwebsocket_protocols protocols[] = {
+       /* first protocol must always be HTTP handler */
+
+       {
+               "default",              /* name */
+               callback_echo,          /* callback */
+               sizeof(struct per_session_data__echo)   /* per_session_data_size */
+       },
+       {
+               NULL, NULL, 0           /* End of list */
+       }
+};
+
+void sighandler(int sig)
+{
+       force_exit = 1;
+}
+
+static struct option options[] = {
+       { "help",       no_argument,            NULL, 'h' },
+       { "debug",      required_argument,      NULL, 'd' },
+       { "port",       required_argument,      NULL, 'p' },
+#ifndef LWS_NO_CLIENT
+       { "client",     required_argument,      NULL, 'c' },
+       { "ratems",     required_argument,      NULL, 'r' },
+#endif
+       { "ssl",        no_argument,            NULL, 's' },
+       { "interface",  required_argument,      NULL, 'i' },
+#ifndef LWS_NO_DAEMONIZE
+       { "daemonize",  no_argument,            NULL, 'D' },
+#endif
+       { NULL, 0, 0, 0 }
+};
+
+int main(int argc, char **argv)
+{
+       int n = 0;
+       int port = 7681;
+       int use_ssl = 0;
+       struct libwebsocket_context *context;
+       int opts = 0;
+       char interface_name[128] = "";
+       const char *interface = NULL;
+       int syslog_options = LOG_PID | LOG_PERROR;
+       int client = 0;
+       int listen_port;
+       struct lws_context_creation_info info;
+#ifndef LWS_NO_CLIENT
+       char address[256];
+       int rate_us = 250000;
+       unsigned int oldus = 0;
+       struct libwebsocket *wsi;
+#endif
+
+       int debug_level = 7;
+#ifndef LWS_NO_DAEMONIZE
+       int daemonize = 0;
+#endif
+
+       memset(&info, 0, sizeof info);
+
+#ifndef LWS_NO_CLIENT
+       lwsl_notice("Built to support client operations\n");
+#endif
+#ifndef LWS_NO_SERVER
+       lwsl_notice("Built to support server operations\n");
+#endif
+
+       while (n >= 0) {
+               n = getopt_long(argc, argv, "i:hsp:d:D"
+#ifndef LWS_NO_CLIENT
+                       "c:r:"
+#endif
+                               , options, NULL);
+               if (n < 0)
+                       continue;
+               switch (n) {
+#ifndef LWS_NO_DAEMONIZE
+               case 'D':
+                       daemonize = 1;
+                       syslog_options &= ~LOG_PERROR;
+                       break;
+#endif
+#ifndef LWS_NO_CLIENT
+               case 'c':
+                       client = 1;
+                       strcpy(address, optarg);
+                       port = 80;
+                       break;
+               case 'r':
+                       rate_us = atoi(optarg) * 1000;
+                       break;
+#endif
+               case 'd':
+                       debug_level = atoi(optarg);
+                       break;
+               case 's':
+                       use_ssl = 1; /* 1 = take care about cert verification, 2 = allow anything */
+                       break;
+               case 'p':
+                       port = atoi(optarg);
+                       break;
+               case 'i':
+                       strncpy(interface_name, optarg, sizeof interface_name);
+                       interface_name[(sizeof interface_name) - 1] = '\0';
+                       interface = interface_name;
+                       break;
+               case '?':
+               case 'h':
+                       fprintf(stderr, "Usage: libwebsockets-test-echo "
+                                       "[--ssl] "
+#ifndef LWS_NO_CLIENT
+                                       "[--client <remote ads>] "
+                                       "[--ratems <ms>] "
+#endif
+                                       "[--port=<p>] "
+                                       "[-d <log bitfield>]\n");
+                       exit(1);
+               }
+       }
+
+#ifndef LWS_NO_DAEMONIZE
+       /*
+        * normally lock path would be /var/lock/lwsts or similar, to
+        * simplify getting started without having to take care about
+        * permissions or running as root, set to /tmp/.lwsts-lock
+        */
+       if (!client && daemonize && lws_daemonize("/tmp/.lwstecho-lock")) {
+               fprintf(stderr, "Failed to daemonize\n");
+               return 1;
+       }
+#endif
+
+       /* we will only try to log things according to our debug_level */
+       setlogmask(LOG_UPTO (LOG_DEBUG));
+       openlog("lwsts", syslog_options, LOG_DAEMON);
+
+       /* tell the library what debug level to emit and to send it to syslog */
+       lws_set_log_level(debug_level, lwsl_emit_syslog);
+
+       lwsl_notice("libwebsockets echo test - "
+                       "(C) Copyright 2010-2013 Andy Green <andy@warmcat.com> - "
+                                                   "licensed under LGPL2.1\n");
+#ifndef LWS_NO_CLIENT
+       if (client) {
+               lwsl_notice("Running in client mode\n");
+               listen_port = CONTEXT_PORT_NO_LISTEN;
+               if (use_ssl)
+                       use_ssl = 2;
+       } else {
+#endif
+#ifndef LWS_NO_SERVER
+               lwsl_notice("Running in server mode\n");
+               listen_port = port;
+#endif
+#ifndef LWS_NO_CLIENT
+       }
+#endif
+
+       info.port = listen_port;
+       info.iface = interface;
+       info.protocols = protocols;
+#ifndef LWS_NO_EXTENSIONS
+       info.extensions = libwebsocket_get_internal_extensions();
+#endif
+       if (use_ssl && !client) {
+               info.ssl_cert_filepath = LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem";
+               info.ssl_private_key_filepath = LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem";
+       }
+       info.gid = -1;
+       info.uid = -1;
+       info.options = opts;
+
+       context = libwebsocket_create_context(&info);
+
+       if (context == NULL) {
+               lwsl_err("libwebsocket init failed\n");
+               return -1;
+       }
+
+#ifndef LWS_NO_CLIENT
+       if (client) {
+               lwsl_notice("Client connecting to %s:%u....\n", address, port);
+               /* we are in client mode */
+               wsi = libwebsocket_client_connect(context, address,
+                               port, use_ssl, "/", address,
+                                "origin", NULL, -1);
+               if (!wsi) {
+                       lwsl_err("Client failed to connect to %s:%u\n", address, port);
+                       goto bail;
+               }
+               lwsl_notice("Client connected to %s:%u\n", address, port);
+       }
+#endif
+       signal(SIGINT, sighandler);
+
+       n = 0;
+       while (n >= 0 && !force_exit) {
+#ifndef LWS_NO_CLIENT
+               struct timeval tv;
+
+               if (client) {
+                       gettimeofday(&tv, NULL);
+
+                       if (((unsigned int)tv.tv_usec - oldus) > rate_us) {
+                               libwebsocket_callback_on_writable_all_protocol(&protocols[0]);
+                               oldus = tv.tv_usec;
+                       }
+               }
+#endif
+               n = libwebsocket_service(context, 10);
+       }
+#ifndef LWS_NO_CLIENT
+bail:
+#endif
+       libwebsocket_context_destroy(context);
+
+       lwsl_notice("libwebsockets-test-echo exited cleanly\n");
+
+       closelog();
+
+       return 0;
+}
diff --git a/test-server/test-fraggle.c b/test-server/test-fraggle.c
new file mode 100644 (file)
index 0000000..01b0819
--- /dev/null
@@ -0,0 +1,365 @@
+/*
+ * libwebsockets-test-fraggle - random fragmentation test
+ *
+ * Copyright (C) 2010-2011 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+#include <sys/time.h>
+
+#ifdef CMAKE_BUILD
+#include "lws_config.h"
+#endif
+
+#include "../lib/libwebsockets.h"
+
+#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server"
+
+static int client;
+static int terminate;
+
+enum demo_protocols {
+       PROTOCOL_FRAGGLE,
+
+       /* always last */
+       DEMO_PROTOCOL_COUNT
+};
+
+/* fraggle protocol */
+
+enum fraggle_states {
+       FRAGSTATE_START_MESSAGE,
+       FRAGSTATE_RANDOM_PAYLOAD,
+       FRAGSTATE_POST_PAYLOAD_SUM,
+};
+
+struct per_session_data__fraggle {
+       int packets_left;
+       int total_message;
+       unsigned long sum;
+       enum fraggle_states state;
+};
+
+static int
+callback_fraggle(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi,
+                       enum libwebsocket_callback_reasons reason,
+                                              void *user, void *in, size_t len)
+{
+       int n;
+       unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 8000 +
+                                                 LWS_SEND_BUFFER_POST_PADDING];
+       struct per_session_data__fraggle *psf = user;
+       int chunk;
+       int write_mode = LWS_WRITE_CONTINUATION;
+       unsigned long sum;
+       unsigned char *p = (unsigned char *)in;
+       unsigned char *bp = &buf[LWS_SEND_BUFFER_PRE_PADDING];
+
+       switch (reason) {
+
+       case LWS_CALLBACK_ESTABLISHED:
+
+               fprintf(stderr, "server sees client connect\n");
+               psf->state = FRAGSTATE_START_MESSAGE;
+               /* start the ball rolling */
+               libwebsocket_callback_on_writable(context, wsi);
+               break;
+
+       case LWS_CALLBACK_CLIENT_ESTABLISHED:
+
+               fprintf(stderr, "client connects to server\n");
+               psf->state = FRAGSTATE_START_MESSAGE;
+               break;
+
+       case LWS_CALLBACK_CLIENT_RECEIVE:
+
+               switch (psf->state) {
+
+               case FRAGSTATE_START_MESSAGE:
+
+                       psf->state = FRAGSTATE_RANDOM_PAYLOAD;
+                       psf->sum = 0;
+                       psf->total_message = 0;
+                       psf->packets_left = 0;
+
+                       /* fallthru */
+
+               case FRAGSTATE_RANDOM_PAYLOAD:
+
+                       for (n = 0; n < len; n++)
+                               psf->sum += p[n];
+
+                       psf->total_message += len;
+                       psf->packets_left++;
+
+                       if (libwebsocket_is_final_fragment(wsi))
+                               psf->state = FRAGSTATE_POST_PAYLOAD_SUM;
+                       break;
+
+               case FRAGSTATE_POST_PAYLOAD_SUM:
+
+                       sum = p[0] << 24;
+                       sum |= p[1] << 16;
+                       sum |= p[2] << 8;
+                       sum |= p[3];
+                       if (sum == psf->sum)
+                               fprintf(stderr, "EOM received %d correctly "
+                                               "from %d fragments\n",
+                                       psf->total_message, psf->packets_left);
+                       else
+                               fprintf(stderr, "**** ERROR at EOM: "
+                                               "length %d, rx sum = 0x%lX, "
+                                               "server says it sent 0x%lX\n",
+                                            psf->total_message, psf->sum, sum);
+
+                       psf->state = FRAGSTATE_START_MESSAGE;
+                       break;
+               }
+               break;
+
+       case LWS_CALLBACK_SERVER_WRITEABLE:
+
+               switch (psf->state) {
+
+               case FRAGSTATE_START_MESSAGE:
+
+                       psf->packets_left = (random() % 1024) + 1;
+                       fprintf(stderr, "Spamming %d random fragments\n",
+                                                            psf->packets_left);
+                       psf->sum = 0;
+                       psf->total_message = 0;
+                       write_mode = LWS_WRITE_BINARY;
+                       psf->state = FRAGSTATE_RANDOM_PAYLOAD;
+
+                       /* fallthru */
+
+               case FRAGSTATE_RANDOM_PAYLOAD:
+
+                       /*
+                        * note how one chunk can be 8000, but we use the
+                        * default rx buffer size of 4096, so we exercise the
+                        * code for rx spill because the rx buffer is full
+                        */
+
+                       chunk = (random() % 8000) + 1;
+                       psf->total_message += chunk;
+
+                       libwebsockets_get_random(context, bp, chunk);
+                       for (n = 0; n < chunk; n++)
+                               psf->sum += bp[n];
+
+                       psf->packets_left--;
+                       if (psf->packets_left)
+                               write_mode |= LWS_WRITE_NO_FIN;
+                       else
+                               psf->state = FRAGSTATE_POST_PAYLOAD_SUM;
+
+                       n = libwebsocket_write(wsi, bp, chunk, write_mode);
+                       if (n < 0)
+                               return -1;
+                       if (n < chunk) {
+                               lwsl_err("Partial write\n");
+                               return -1;
+                       }
+
+                       libwebsocket_callback_on_writable(context, wsi);
+                       break;
+
+               case FRAGSTATE_POST_PAYLOAD_SUM:
+
+                       fprintf(stderr, "Spamming session over, "
+                                       "len = %d. sum = 0x%lX\n",
+                                                 psf->total_message, psf->sum);
+
+                       bp[0] = psf->sum >> 24;
+                       bp[1] = psf->sum >> 16;
+                       bp[2] = psf->sum >> 8;
+                       bp[3] = psf->sum;
+
+                       n = libwebsocket_write(wsi, (unsigned char *)bp,
+                                                          4, LWS_WRITE_BINARY);
+                       if (n < 0)
+                               return -1;
+                       if (n < 4) {
+                               lwsl_err("Partial write\n");
+                               return -1;
+                       }
+
+                       psf->state = FRAGSTATE_START_MESSAGE;
+
+                       libwebsocket_callback_on_writable(context, wsi);
+                       break;
+               }
+               break;
+
+       case LWS_CALLBACK_CLOSED:
+
+               terminate = 1;
+               break;
+
+       /* because we are protocols[0] ... */
+
+       case LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED:
+               if (strcmp(in, "deflate-stream") == 0) {
+                       fprintf(stderr, "denied deflate-stream extension\n");
+                       return 1;
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+
+
+/* list of supported protocols and callbacks */
+
+static struct libwebsocket_protocols protocols[] = {
+       {
+               "fraggle-protocol",
+               callback_fraggle,
+               sizeof(struct per_session_data__fraggle),
+       },
+       {
+               NULL, NULL, 0           /* End of list */
+       }
+};
+
+static struct option options[] = {
+       { "help",       no_argument,            NULL, 'h' },
+       { "debug",      required_argument,      NULL, 'd' },
+       { "port",       required_argument,      NULL, 'p' },
+       { "ssl",        no_argument,            NULL, 's' },
+       { "interface",  required_argument,      NULL, 'i' },
+       { "client",     no_argument,            NULL, 'c' },
+       { NULL, 0, 0, 0 }
+};
+
+int main(int argc, char **argv)
+{
+       int n = 0;
+       int port = 7681;
+       int use_ssl = 0;
+       struct libwebsocket_context *context;
+       int opts = 0;
+       char interface_name[128] = "";
+       const char *iface = NULL;
+       struct libwebsocket *wsi;
+       const char *address;
+       int server_port = port;
+       struct lws_context_creation_info info;
+
+       memset(&info, 0, sizeof info);
+
+       fprintf(stderr, "libwebsockets test fraggle\n"
+                       "(C) Copyright 2010-2013 Andy Green <andy@warmcat.com> "
+                                                   "licensed under LGPL2.1\n");
+
+       while (n >= 0) {
+               n = getopt_long(argc, argv, "ci:hsp:d:", options, NULL);
+               if (n < 0)
+                       continue;
+               switch (n) {
+               case 'd':
+                       lws_set_log_level(atoi(optarg), NULL);
+                       break;
+               case 's':
+                       use_ssl = 1;
+                       break;
+               case 'p':
+                       port = atoi(optarg);
+                       server_port = port;
+                       break;
+               case 'i':
+                       strncpy(interface_name, optarg, sizeof interface_name);
+                       interface_name[(sizeof interface_name) - 1] = '\0';
+                       iface = interface_name;
+                       break;
+               case 'c':
+                       client = 1;
+                       fprintf(stderr, " Client mode\n");
+                       break;
+               case 'h':
+                       fprintf(stderr, "Usage: libwebsockets-test-fraggle "
+                                       "[--port=<p>] [--ssl] "
+                                       "[-d <log bitfield>] "
+                                       "[--client]\n");
+                       exit(1);
+               }
+       }
+
+       if (client) {
+               server_port = CONTEXT_PORT_NO_LISTEN;
+               if (optind >= argc) {
+                       fprintf(stderr, "Must give address of server\n");
+                       return 1;
+               }
+       }
+
+       info.port = server_port;
+       info.iface = iface;
+       info.protocols = protocols;
+#ifndef LWS_NO_EXTENSIONS
+       info.extensions = libwebsocket_get_internal_extensions();
+#endif
+       if (use_ssl) {
+               info.ssl_cert_filepath = LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem";
+               info.ssl_private_key_filepath = LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem";
+       }
+       info.gid = -1;
+       info.uid = -1;
+       info.options = opts;
+
+       context = libwebsocket_create_context(&info);
+       if (context == NULL) {
+               fprintf(stderr, "libwebsocket init failed\n");
+               return -1;
+       }
+
+       if (client) {
+               address = argv[optind];
+               fprintf(stderr, "Connecting to %s:%u\n", address, port);
+               wsi = libwebsocket_client_connect(context, address,
+                                                  port, use_ssl, "/", address,
+                                "origin", protocols[PROTOCOL_FRAGGLE].name,
+                                                                 -1);
+               if (wsi == NULL) {
+                       fprintf(stderr, "Client connect to server failed\n");
+                       goto bail;
+               }
+       }
+
+       n = 0;
+       while (!n && !terminate)
+               n = libwebsocket_service(context, 50);
+
+       fprintf(stderr, "Terminating...\n");
+
+bail:
+       libwebsocket_context_destroy(context);
+
+       return 0;
+}
diff --git a/test-server/test-ping.c b/test-server/test-ping.c
new file mode 100644 (file)
index 0000000..098981c
--- /dev/null
@@ -0,0 +1,545 @@
+/*
+ * libwebsockets-test-ping - libwebsockets floodping
+ *
+ * Copyright (C) 2011 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+#ifndef WIN32
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <poll.h>
+#endif
+
+#ifdef CMAKE_BUILD
+#include "lws_config.h"
+#endif
+
+#include <netdb.h>
+
+#include "../lib/libwebsockets.h"
+
+/*
+ * this is specified in the 04 standard, control frames can only have small
+ * payload length styles
+ */
+#define MAX_PING_PAYLOAD 125
+#define MAX_MIRROR_PAYLOAD 4096
+#define MAX_PING_CLIENTS 256
+#define PING_RINGBUFFER_SIZE 256
+
+static struct libwebsocket *ping_wsi[MAX_PING_CLIENTS];
+static unsigned int interval_us = 1000000;
+static unsigned int size = 64;
+static int flood;
+static const char *address;
+static unsigned char pingbuf[LWS_SEND_BUFFER_PRE_PADDING + MAX_MIRROR_PAYLOAD +
+                                                 LWS_SEND_BUFFER_POST_PADDING];
+static char peer_name[128];
+static unsigned long started;
+static int screen_width = 80;
+static int use_mirror;
+static unsigned int write_options;
+
+static unsigned long rtt_min = 100000000;
+static unsigned long rtt_max;
+static unsigned long rtt_avg;
+static unsigned long global_rx_count;
+static unsigned long global_tx_count;
+static int clients = 1;
+static unsigned long interrupted_time;
+
+struct ping {
+       unsigned long issue_timestamp;
+       unsigned long index;
+       unsigned int seen;
+};
+
+struct per_session_data__ping {
+       unsigned long ping_index;
+
+       struct ping ringbuffer[PING_RINGBUFFER_SIZE];
+       int ringbuffer_head;
+       int ringbuffer_tail;
+
+       unsigned long rx_count;
+};
+
+/*
+ * uses the ping pong protocol features to provide an equivalent for the
+ * ping utility for 04+ websockets
+ */
+
+enum demo_protocols {
+
+       PROTOCOL_LWS_MIRROR,
+
+       /* always last */
+       DEMO_PROTOCOL_COUNT
+};
+
+
+static int
+callback_lws_mirror(struct libwebsocket_context * this,
+                       struct libwebsocket *wsi,
+                       enum libwebsocket_callback_reasons reason,
+                                              void *user, void *in, size_t len)
+{
+       struct timeval tv;
+       unsigned char *p;
+       int shift;
+       unsigned long l;
+       unsigned long iv;
+       int n;
+       int match = 0;
+       struct per_session_data__ping *psd = user;
+
+       switch (reason) {
+       case LWS_CALLBACK_CLOSED:
+
+               fprintf(stderr, "LWS_CALLBACK_CLOSED on %p\n", (void *)wsi);
+
+               /* remove closed guy */
+       
+               for (n = 0; n < clients; n++)
+                       if (ping_wsi[n] == wsi) {                               
+                               clients--;
+                               while (n < clients) {
+                                       ping_wsi[n] = ping_wsi[n + 1];
+                                       n++;
+                               }
+                       }
+
+               break;
+
+       case LWS_CALLBACK_CLIENT_ESTABLISHED:
+
+               psd->rx_count = 0;
+               psd->ping_index = 1;
+               psd->ringbuffer_head = 0;
+               psd->ringbuffer_tail = 0;
+
+               /*
+                * start the ball rolling,
+                * LWS_CALLBACK_CLIENT_WRITEABLE will come next service
+                */
+
+               libwebsocket_callback_on_writable(this, wsi);
+               break;
+
+       case LWS_CALLBACK_CLIENT_RECEIVE:
+       case LWS_CALLBACK_CLIENT_RECEIVE_PONG:
+               gettimeofday(&tv, NULL);
+               iv = (tv.tv_sec * 1000000) + tv.tv_usec;
+
+               psd->rx_count++;
+
+               shift = 56;
+               p = in;
+               l = 0;
+
+               while (shift >= 0) {
+                       l |= (*p++) << shift;
+                       shift -= 8;
+               }
+
+               /* find it in the ringbuffer, look backwards from head */
+               n = psd->ringbuffer_head;
+               while (!match) {
+
+                       if (psd->ringbuffer[n].index == l) {
+                               psd->ringbuffer[n].seen++;
+                               match = 1;
+                               continue;
+                       }
+
+                       if (n == psd->ringbuffer_tail) {
+                               match = -1;
+                               continue;
+                       }
+
+                       if (n == 0)
+                               n = PING_RINGBUFFER_SIZE - 1;
+                       else
+                               n--;
+               }
+
+               if (match < 1) {
+
+                       if (!flood)
+                               fprintf(stderr, "%d bytes from %s: req=%ld "
+                                     "time=(unknown)\n", (int)len, address, l);
+                       else
+                               fprintf(stderr, "\b \b");
+
+                       break;
+               }
+
+               if (psd->ringbuffer[n].seen > 1)
+                       fprintf(stderr, "DUP! ");
+
+               if ((iv - psd->ringbuffer[n].issue_timestamp) < rtt_min)
+                       rtt_min = iv - psd->ringbuffer[n].issue_timestamp;
+
+               if ((iv - psd->ringbuffer[n].issue_timestamp) > rtt_max)
+                       rtt_max = iv - psd->ringbuffer[n].issue_timestamp;
+
+               rtt_avg += iv - psd->ringbuffer[n].issue_timestamp;
+               global_rx_count++;
+
+               if (!flood)
+                       fprintf(stderr, "%d bytes from %s: req=%ld "
+                               "time=%lu.%lums\n", (int)len, address, l,
+                              (iv - psd->ringbuffer[n].issue_timestamp) / 1000,
+                       ((iv - psd->ringbuffer[n].issue_timestamp) / 100) % 10);
+               else
+                       fprintf(stderr, "\b \b");
+               break;
+
+       case LWS_CALLBACK_CLIENT_WRITEABLE:
+
+               shift = 56;
+               p = &pingbuf[LWS_SEND_BUFFER_PRE_PADDING];
+
+               /* 64-bit ping index in network byte order */
+
+               while (shift >= 0) {
+                       *p++ = psd->ping_index >> shift;
+                       shift -= 8;
+               }
+
+               while (p - &pingbuf[LWS_SEND_BUFFER_PRE_PADDING] < size)
+                       *p++ = 0;
+
+               gettimeofday(&tv, NULL);
+
+               psd->ringbuffer[psd->ringbuffer_head].issue_timestamp =
+                                            (tv.tv_sec * 1000000) + tv.tv_usec;
+               psd->ringbuffer[psd->ringbuffer_head].index = psd->ping_index++;
+               psd->ringbuffer[psd->ringbuffer_head].seen = 0;
+
+               if (psd->ringbuffer_head == PING_RINGBUFFER_SIZE - 1)
+                       psd->ringbuffer_head = 0;
+               else
+                       psd->ringbuffer_head++;
+
+               /* snip any re-used tail so we keep to the ring length */
+
+               if (psd->ringbuffer_tail == psd->ringbuffer_head) {
+                       if (psd->ringbuffer_tail == PING_RINGBUFFER_SIZE - 1)
+                               psd->ringbuffer_tail = 0;
+                       else
+                               psd->ringbuffer_tail++;
+               }
+
+               global_tx_count++;
+
+               if (use_mirror)
+                       n = libwebsocket_write(wsi,
+                               &pingbuf[LWS_SEND_BUFFER_PRE_PADDING],
+                                       size, write_options | LWS_WRITE_BINARY);
+               else
+                       n = libwebsocket_write(wsi,
+                               &pingbuf[LWS_SEND_BUFFER_PRE_PADDING],
+                                       size, write_options | LWS_WRITE_PING);
+
+               if (n < 0)
+                       return -1;
+               if (n < size) {
+                       lwsl_err("Partial write\n");
+                       return -1;
+               }
+
+               if (flood &&
+                        (psd->ping_index - psd->rx_count) < (screen_width - 1))
+                       fprintf(stderr, ".");
+               break;
+
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+
+/* list of supported protocols and callbacks */
+
+static struct libwebsocket_protocols protocols[] = {
+
+       {
+               "lws-mirror-protocol",
+               callback_lws_mirror,
+               sizeof (struct per_session_data__ping),
+       },
+       { 
+               NULL, NULL, 0/* end of list */          
+       }
+};
+
+static struct option options[] = {
+       { "help",       no_argument,            NULL, 'h' },
+       { "debug",      required_argument,      NULL, 'd' },
+       { "port",       required_argument,      NULL, 'p' },
+       { "ssl",        no_argument,            NULL, 't' },
+       { "interval",   required_argument,      NULL, 'i' },
+       { "size",       required_argument,      NULL, 's' },
+       { "protocol",   required_argument,      NULL, 'n' },
+       { "flood",      no_argument,            NULL, 'f' },
+       { "mirror",     no_argument,            NULL, 'm' },
+       { "replicate",  required_argument,      NULL, 'r' },
+       { "killmask",   no_argument,            NULL, 'k' },
+       { "version",    required_argument,      NULL, 'v' },
+       { NULL, 0, 0, 0 }
+};
+
+#ifndef WIN32
+static void
+signal_handler(int sig, siginfo_t *si, void *v)
+{
+       struct timeval tv;
+
+       gettimeofday(&tv, NULL);
+       interrupted_time = (tv.tv_sec * 1000000) + tv.tv_usec;
+}
+#endif
+
+int main(int argc, char **argv)
+{
+       int n = 0;
+       int port = 7681;
+       int use_ssl = 0;
+       struct libwebsocket_context *context;
+       char protocol_name[256];
+       char ip[30];
+#ifndef WIN32
+       struct sigaction sa;
+       struct winsize w;
+#endif
+       struct timeval tv;
+       unsigned long oldus = 0;
+       unsigned long l;
+       int ietf_version = -1;
+       struct lws_context_creation_info info;
+
+       memset(&info, 0, sizeof info);
+
+       if (argc < 2)
+               goto usage;
+
+       address = argv[1];
+       optind++;
+
+       while (n >= 0) {
+               n = getopt_long(argc, argv, "v:kr:hmfts:n:i:p:d:", options, NULL);
+               if (n < 0)
+                       continue;
+               switch (n) {
+               case 'd':
+                       lws_set_log_level(atoi(optarg), NULL);
+                       break;
+               case 'm':
+                       use_mirror = 1;
+                       break;
+               case 't':
+                       use_ssl = 2; /* 2 = allow selfsigned */
+                       break;
+               case 'p':
+                       port = atoi(optarg);
+                       break;
+               case 'n':
+                       strncpy(protocol_name, optarg, sizeof protocol_name);
+                       protocol_name[(sizeof protocol_name) - 1] = '\0';
+                       protocols[PROTOCOL_LWS_MIRROR].name = protocol_name;
+                       break;
+               case 'i':
+                       interval_us = 1000000.0 * atof(optarg);
+                       break;
+               case 's':
+                       size = atoi(optarg);
+                       break;
+               case 'f':
+                       flood = 1;
+                       break;
+               case 'r':
+                       clients = atoi(optarg);
+                       if (clients > MAX_PING_CLIENTS || clients < 1) {
+                               fprintf(stderr, "Max clients supportd = %d\n",
+                                                             MAX_PING_CLIENTS);
+                               return 1;
+                       }
+                       break;
+               case 'k':
+                       write_options = LWS_WRITE_CLIENT_IGNORE_XOR_MASK;
+                       break;
+               case 'v':
+                       ietf_version = atoi(optarg);
+                       break;
+
+               case 'h':
+                       goto usage;
+               }
+       }
+
+       if (!use_mirror) {
+               if (size > MAX_PING_PAYLOAD) {
+                       fprintf(stderr, "Max ping opcode payload size %d\n",
+                                                             MAX_PING_PAYLOAD);
+                       return 1;
+               }
+       } else {
+               if (size > MAX_MIRROR_PAYLOAD) {
+                       fprintf(stderr, "Max mirror payload size %d\n",
+                                                           MAX_MIRROR_PAYLOAD);
+                       return 1;
+               }
+       }
+
+#ifndef WIN32
+       if (isatty(STDOUT_FILENO))
+               if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1)
+                       if (w.ws_col > 0)
+                               screen_width = w.ws_col;
+#endif
+
+       info.port = CONTEXT_PORT_NO_LISTEN;
+       info.protocols = protocols;
+#ifndef LWS_NO_EXTENSIONS
+       info.extensions = libwebsocket_get_internal_extensions();
+#endif
+       info.gid = -1;
+       info.uid = -1;
+
+       context = libwebsocket_create_context(&info);
+       if (context == NULL) {
+               fprintf(stderr, "Creating libwebsocket context failed\n");
+               return 1;
+       }
+
+       /* create client websockets using dumb increment protocol */
+
+       for (n = 0; n < clients; n++) {
+               ping_wsi[n] = libwebsocket_client_connect(context, address,
+                                                  port, use_ssl, "/", address,
+                                "origin", protocols[PROTOCOL_LWS_MIRROR].name,
+                                                                 ietf_version);
+               if (ping_wsi[n] == NULL) {
+                       fprintf(stderr, "client connection %d failed to "
+                                                               "connect\n", n);
+                       return 1;
+               }
+       }
+
+       libwebsockets_get_peer_addresses(context, ping_wsi[0],
+                       libwebsocket_get_socket_fd(ping_wsi[0]),
+                                   peer_name, sizeof peer_name, ip, sizeof ip);
+
+       fprintf(stderr, "Websocket PING %s (%s) %d bytes of data.\n",
+                                                          peer_name, ip, size);
+
+#ifndef WIN32
+       /* set the ^C handler */
+       sa.sa_sigaction = signal_handler;
+       sa.sa_flags = SA_SIGINFO;
+       sigemptyset(&sa.sa_mask);
+       sigaction(SIGINT, &sa, NULL);
+#endif
+
+       gettimeofday(&tv, NULL);
+       started = (tv.tv_sec * 1000000) + tv.tv_usec;
+
+       /* service loop */
+
+       n = 0;
+       while (n >= 0) {
+
+               gettimeofday(&tv, NULL);
+               l = (tv.tv_sec * 1000000) + tv.tv_usec;
+
+               /* servers can hang up on us */
+
+               if (clients == 0) {
+                       n = -1;
+                       continue;
+               }
+
+               if (!interrupted_time) {
+                       if ((l - oldus) > interval_us) {
+                               for (n = 0; n < clients; n++)
+                                       libwebsocket_callback_on_writable(
+                                                         context, ping_wsi[n]);
+                               oldus = l;
+                       }
+               } else
+
+                       /* allow time for in-flight pongs to come */
+               
+                       if ((l - interrupted_time) > 250000) {
+                               n = -1;
+                               continue;
+                       }
+
+               if (!interval_us)
+                       n = libwebsocket_service(context, 0);
+               else
+                       n = libwebsocket_service(context, 1);
+       }
+
+       /* stats */
+
+       fprintf(stderr, "\n--- %s websocket ping statistics "
+               "using %d connections ---\n"
+               "%lu packets transmitted, %lu received, "
+               "%lu%% packet loss, time %ldms\n"
+               "rtt min/avg/max = %0.3f/%0.3f/%0.3f ms\n"
+               "payload bandwidth average %0.3f KiBytes/sec\n",
+               peer_name, clients, global_tx_count, global_rx_count,
+               ((global_tx_count - global_rx_count) * 100) / global_tx_count,
+               (l - started) / 1000,
+               ((double)rtt_min) / 1000.0,
+               ((double)rtt_avg / global_rx_count) / 1000.0,
+               ((double)rtt_max) / 1000.0,
+               ((double)global_rx_count * (double)size) /
+                                 ((double)(l - started) / 1000000.0) / 1024.0);
+
+       libwebsocket_context_destroy(context);
+
+       return 0;
+
+usage:
+       fprintf(stderr, "Usage: libwebsockets-test-ping "
+                                            "<server address> [--port=<p>] "
+                                            "[--ssl] [--interval=<float sec>] "
+                                            "[--size=<bytes>] "
+                                            "[--protocol=<protocolname>] "
+                                            "[--mirror] "
+                                            "[--replicate=clients>] "
+                                            "[--version <version>] "
+                                            "[-d <log bitfield> ]"
+                                            "\n");
+       return 1;
+}
diff --git a/test-server/test-server.c b/test-server/test-server.c
new file mode 100644 (file)
index 0000000..6af7a99
--- /dev/null
@@ -0,0 +1,799 @@
+/*
+ * libwebsockets-test-server - libwebsockets test implementation
+ *
+ * Copyright (C) 2010-2011 Andy Green <andy@warmcat.com>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation:
+ *  version 2.1 of the License.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+#ifdef CMAKE_BUILD
+#include "lws_config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <assert.h>
+#ifdef WIN32
+
+#ifdef EXTERNAL_POLL
+       #ifndef WIN32_LEAN_AND_MEAN
+       #define WIN32_LEAN_AND_MEAN
+       #endif
+       #include <winsock2.h>
+       #include <ws2tcpip.h>
+       #include <stddef.h>
+
+       #include "websock-w32.h"
+#endif
+
+#else // NOT WIN32
+#include <syslog.h>
+#endif
+
+#include <signal.h>
+
+#include "../lib/libwebsockets.h"
+
+static int close_testing;
+int max_poll_elements;
+
+struct pollfd *pollfds;
+int *fd_lookup;
+int count_pollfds;
+int force_exit = 0;
+
+/*
+ * This demo server shows how to use libwebsockets for one or more
+ * websocket protocols in the same server
+ *
+ * It defines the following websocket protocols:
+ *
+ *  dumb-increment-protocol:  once the socket is opened, an incrementing
+ *                             ascii string is sent down it every 50ms.
+ *                             If you send "reset\n" on the websocket, then
+ *                             the incrementing number is reset to 0.
+ *
+ *  lws-mirror-protocol: copies any received packet to every connection also
+ *                             using this protocol, including the sender
+ */
+
+enum demo_protocols {
+       /* always first */
+       PROTOCOL_HTTP = 0,
+
+       PROTOCOL_DUMB_INCREMENT,
+       PROTOCOL_LWS_MIRROR,
+
+       /* always last */
+       DEMO_PROTOCOL_COUNT
+};
+
+
+#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server"
+
+/*
+ * We take a strict whitelist approach to stop ../ attacks
+ */
+
+struct serveable {
+       const char *urlpath;
+       const char *mimetype;
+}; 
+
+static const struct serveable whitelist[] = {
+       { "/favicon.ico", "image/x-icon" },
+       { "/libwebsockets.org-logo.png", "image/png" },
+
+       /* last one is the default served if no match */
+       { "/test.html", "text/html" },
+};
+
+struct per_session_data__http {
+       int fd;
+};
+
+/* this protocol server (always the first one) just knows how to do HTTP */
+
+static int callback_http(struct libwebsocket_context *context,
+               struct libwebsocket *wsi,
+               enum libwebsocket_callback_reasons reason, void *user,
+                                                          void *in, size_t len)
+{
+#if 0
+       char client_name[128];
+       char client_ip[128];
+#endif
+       char buf[256];
+       int n, m;
+       unsigned char *p;
+       static unsigned char buffer[4096];
+       struct stat stat_buf;
+       struct per_session_data__http *pss = (struct per_session_data__http *)user;
+#ifdef EXTERNAL_POLL
+       int fd = (int)(long)in;
+#endif
+
+       switch (reason) {
+       case LWS_CALLBACK_HTTP:
+
+               /* check for the "send a big file by hand" example case */
+
+               if (!strcmp((const char *)in, "/leaf.jpg")) {
+
+                       /* well, let's demonstrate how to send the hard way */
+
+                       p = buffer;
+
+                       pss->fd = open(LOCAL_RESOURCE_PATH"/leaf.jpg", O_RDONLY);
+                       if (pss->fd < 0)
+                               return -1;
+
+                       fstat(pss->fd, &stat_buf);
+
+                       /*
+                        * we will send a big jpeg file, but it could be
+                        * anything.  Set the Content-Type: appropriately
+                        * so the browser knows what to do with it.
+                        */
+
+                       p += sprintf((char *)p,
+                               "HTTP/1.0 200 OK\x0d\x0a"
+                               "Server: libwebsockets\x0d\x0a"
+                               "Content-Type: image/jpeg\x0d\x0a"
+                                       "Content-Length: %u\x0d\x0a\x0d\x0a",
+                                       (unsigned int)stat_buf.st_size);
+
+                       /*
+                        * send the http headers...
+                        * this won't block since it's the first payload sent
+                        * on the connection since it was established
+                        * (too small for partial)
+                        */
+
+                       n = libwebsocket_write(wsi, buffer,
+                                  p - buffer, LWS_WRITE_HTTP);
+
+                       if (n < 0) {
+                               close(pss->fd);
+                               return -1;
+                       }
+                       /*
+                        * book us a LWS_CALLBACK_HTTP_WRITEABLE callback
+                        */
+                       libwebsocket_callback_on_writable(context, wsi);
+                       break;
+               }
+
+               /* if not, send a file the easy way */
+
+               for (n = 0; n < (sizeof(whitelist) / sizeof(whitelist[0]) - 1); n++)
+                       if (in && strcmp((const char *)in, whitelist[n].urlpath) == 0)
+                               break;
+
+               sprintf(buf, LOCAL_RESOURCE_PATH"%s", whitelist[n].urlpath);
+
+               if (libwebsockets_serve_http_file(context, wsi, buf, whitelist[n].mimetype))
+                       return -1; /* through completion or error, close the socket */
+
+               /*
+                * notice that the sending of the file completes asynchronously,
+                * we'll get a LWS_CALLBACK_HTTP_FILE_COMPLETION callback when
+                * it's done
+                */
+
+               break;
+
+       case LWS_CALLBACK_HTTP_FILE_COMPLETION:
+//             lwsl_info("LWS_CALLBACK_HTTP_FILE_COMPLETION seen\n");
+               /* kill the connection after we sent one file */
+               return -1;
+
+       case LWS_CALLBACK_HTTP_WRITEABLE:
+               /*
+                * we can send more of whatever it is we were sending
+                */
+
+               do {
+                       n = read(pss->fd, buffer, sizeof buffer);
+                       /* problem reading, close conn */
+                       if (n < 0)
+                               goto bail;
+                       /* sent it all, close conn */
+                       if (n == 0)
+                               goto bail;
+                       /*
+                        * because it's HTTP and not websocket, don't need to take
+                        * care about pre and postamble
+                        */
+                       m = libwebsocket_write(wsi, buffer, n, LWS_WRITE_HTTP);
+                       if (m < 0)
+                               /* write failed, close conn */
+                               goto bail;
+                       if (m != n)
+                               /* partial write, adjust */
+                               lseek(pss->fd, m - n, SEEK_CUR);
+
+               } while (!lws_send_pipe_choked(wsi));
+               libwebsocket_callback_on_writable(context, wsi);
+               break;
+
+bail:
+               close(pss->fd);
+               return -1;
+
+       /*
+        * callback for confirming to continue with client IP appear in
+        * protocol 0 callback since no websocket protocol has been agreed
+        * yet.  You can just ignore this if you won't filter on client IP
+        * since the default uhandled callback return is 0 meaning let the
+        * connection continue.
+        */
+
+       case LWS_CALLBACK_FILTER_NETWORK_CONNECTION:
+#if 0
+               libwebsockets_get_peer_addresses(context, wsi, (int)(long)in, client_name,
+                            sizeof(client_name), client_ip, sizeof(client_ip));
+
+               fprintf(stderr, "Received network connect from %s (%s)\n",
+                                                       client_name, client_ip);
+#endif
+               /* if we returned non-zero from here, we kill the connection */
+               break;
+
+#ifdef EXTERNAL_POLL
+       /*
+        * callbacks for managing the external poll() array appear in
+        * protocol 0 callback
+        */
+
+       case LWS_CALLBACK_ADD_POLL_FD:
+
+               if (count_pollfds >= max_poll_elements) {
+                       lwsl_err("LWS_CALLBACK_ADD_POLL_FD: too many sockets to track\n");
+                       return 1;
+               }
+
+               fd_lookup[fd] = count_pollfds;
+               pollfds[count_pollfds].fd = fd;
+               pollfds[count_pollfds].events = (int)(long)len;
+               pollfds[count_pollfds++].revents = 0;
+               break;
+
+       case LWS_CALLBACK_DEL_POLL_FD:
+               if (!--count_pollfds)
+                       break;
+               m = fd_lookup[fd];
+               /* have the last guy take up the vacant slot */
+               pollfds[m] = pollfds[count_pollfds];
+               fd_lookup[pollfds[count_pollfds].fd] = m;
+               break;
+
+       case LWS_CALLBACK_SET_MODE_POLL_FD:
+               pollfds[fd_lookup[fd]].events |= (int)(long)len;
+               break;
+
+       case LWS_CALLBACK_CLEAR_MODE_POLL_FD:
+               pollfds[fd_lookup[fd]].events &= ~(int)(long)len;
+               break;
+#endif
+
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+/*
+ * this is just an example of parsing handshake headers, you don't need this
+ * in your code unless you will filter allowing connections by the header
+ * content
+ */
+
+static void
+dump_handshake_info(struct libwebsocket *wsi)
+{
+       int n;
+       static const char *token_names[WSI_TOKEN_COUNT] = {
+               /*[WSI_TOKEN_GET_URI]           =*/ "GET URI",
+               /*[WSI_TOKEN_HOST]              =*/ "Host",
+               /*[WSI_TOKEN_CONNECTION]        =*/ "Connection",
+               /*[WSI_TOKEN_KEY1]              =*/ "key 1",
+               /*[WSI_TOKEN_KEY2]              =*/ "key 2",
+               /*[WSI_TOKEN_PROTOCOL]          =*/ "Protocol",
+               /*[WSI_TOKEN_UPGRADE]           =*/ "Upgrade",
+               /*[WSI_TOKEN_ORIGIN]            =*/ "Origin",
+               /*[WSI_TOKEN_DRAFT]             =*/ "Draft",
+               /*[WSI_TOKEN_CHALLENGE]         =*/ "Challenge",
+
+               /* new for 04 */
+               /*[WSI_TOKEN_KEY]               =*/ "Key",
+               /*[WSI_TOKEN_VERSION]           =*/ "Version",
+               /*[WSI_TOKEN_SWORIGIN]          =*/ "Sworigin",
+
+               /* new for 05 */
+               /*[WSI_TOKEN_EXTENSIONS]        =*/ "Extensions",
+
+               /* client receives these */
+               /*[WSI_TOKEN_ACCEPT]            =*/ "Accept",
+               /*[WSI_TOKEN_NONCE]             =*/ "Nonce",
+               /*[WSI_TOKEN_HTTP]              =*/ "Http",
+               /*[WSI_TOKEN_MUXURL]    =*/ "MuxURL",
+       };
+       char buf[256];
+
+       for (n = 0; n < WSI_TOKEN_COUNT; n++) {
+               if (!lws_hdr_total_length(wsi, n))
+                       continue;
+
+               lws_hdr_copy(wsi, buf, sizeof buf, n);
+
+               fprintf(stderr, "    %s = %s\n", token_names[n], buf);
+       }
+}
+
+/* dumb_increment protocol */
+
+/*
+ * one of these is auto-created for each connection and a pointer to the
+ * appropriate instance is passed to the callback in the user parameter
+ *
+ * for this example protocol we use it to individualize the count for each
+ * connection.
+ */
+
+struct per_session_data__dumb_increment {
+       int number;
+};
+
+static int
+callback_dumb_increment(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi,
+                       enum libwebsocket_callback_reasons reason,
+                                              void *user, void *in, size_t len)
+{
+       int n;
+       unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 512 +
+                                                 LWS_SEND_BUFFER_POST_PADDING];
+       unsigned char *p = &buf[LWS_SEND_BUFFER_PRE_PADDING];
+       struct per_session_data__dumb_increment *pss = (struct per_session_data__dumb_increment *)user;
+
+       switch (reason) {
+
+       case LWS_CALLBACK_ESTABLISHED:
+               lwsl_info("callback_dumb_increment: "
+                                                "LWS_CALLBACK_ESTABLISHED\n");
+               pss->number = 0;
+               break;
+
+       case LWS_CALLBACK_SERVER_WRITEABLE:
+               n = sprintf((char *)p, "%d", pss->number++);
+               /* too small for partial */
+               n = libwebsocket_write(wsi, p, n, LWS_WRITE_TEXT);
+               if (n < 0) {
+                       lwsl_err("ERROR %d writing to di socket\n", n);
+                       return -1;
+               }
+               if (close_testing && pss->number == 50) {
+                       lwsl_info("close tesing limit, closing\n");
+                       return -1;
+               }
+               break;
+
+       case LWS_CALLBACK_RECEIVE:
+//             fprintf(stderr, "rx %d\n", (int)len);
+               if (len < 6)
+                       break;
+               if (strcmp((const char *)in, "reset\n") == 0)
+                       pss->number = 0;
+               break;
+       /*
+        * this just demonstrates how to use the protocol filter. If you won't
+        * study and reject connections based on header content, you don't need
+        * to handle this callback
+        */
+
+       case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION:
+               dump_handshake_info(wsi);
+               /* you could return non-zero here and kill the connection */
+               break;
+
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+
+/* lws-mirror_protocol */
+
+#define MAX_MESSAGE_QUEUE 128
+
+struct per_session_data__lws_mirror {
+       struct libwebsocket *wsi;
+       int ringbuffer_tail;
+};
+
+struct a_message {
+       void *payload;
+       size_t len;
+};
+
+static struct a_message ringbuffer[MAX_MESSAGE_QUEUE];
+static int ringbuffer_head;
+
+static struct libwebsocket *wsi_choked[20];
+static int num_wsi_choked;
+
+static int
+callback_lws_mirror(struct libwebsocket_context *context,
+                       struct libwebsocket *wsi,
+                       enum libwebsocket_callback_reasons reason,
+                                              void *user, void *in, size_t len)
+{
+       int n;
+       struct per_session_data__lws_mirror *pss = (struct per_session_data__lws_mirror *)user;
+
+       switch (reason) {
+
+       case LWS_CALLBACK_ESTABLISHED:
+               lwsl_info("callback_lws_mirror: "
+                                                "LWS_CALLBACK_ESTABLISHED\n");
+               pss->ringbuffer_tail = ringbuffer_head;
+               pss->wsi = wsi;
+               break;
+
+       case LWS_CALLBACK_PROTOCOL_DESTROY:
+               lwsl_notice("mirror protocol cleaning up\n");
+               for (n = 0; n < sizeof ringbuffer / sizeof ringbuffer[0]; n++)
+                       if (ringbuffer[n].payload)
+                               free(ringbuffer[n].payload);
+               break;
+
+       case LWS_CALLBACK_SERVER_WRITEABLE:
+               if (close_testing)
+                       break;
+               while (pss->ringbuffer_tail != ringbuffer_head) {
+
+                       n = libwebsocket_write(wsi, (unsigned char *)
+                                  ringbuffer[pss->ringbuffer_tail].payload +
+                                  LWS_SEND_BUFFER_PRE_PADDING,
+                                  ringbuffer[pss->ringbuffer_tail].len,
+                                                               LWS_WRITE_TEXT);
+                       if (n < 0) {
+                               lwsl_err("ERROR %d writing to mirror socket\n", n);
+                               return -1;
+                       }
+                       if (n < ringbuffer[pss->ringbuffer_tail].len) {
+                               lwsl_err("mirror partial write %d vs %d\n", n, ringbuffer[pss->ringbuffer_tail].len);
+                       }
+
+                       if (pss->ringbuffer_tail == (MAX_MESSAGE_QUEUE - 1))
+                               pss->ringbuffer_tail = 0;
+                       else
+                               pss->ringbuffer_tail++;
+
+                       if (((ringbuffer_head - pss->ringbuffer_tail) &
+                                 (MAX_MESSAGE_QUEUE - 1)) == (MAX_MESSAGE_QUEUE - 15)) {
+                               for (n = 0; n < num_wsi_choked; n++)
+                                       libwebsocket_rx_flow_control(wsi_choked[n], 1);
+                               num_wsi_choked = 0;
+                       }
+                       // lwsl_debug("tx fifo %d\n", (ringbuffer_head - pss->ringbuffer_tail) & (MAX_MESSAGE_QUEUE - 1));
+
+                       if (lws_send_pipe_choked(wsi)) {
+                               libwebsocket_callback_on_writable(context, wsi);
+                               return 0;
+                       }
+               }
+               break;
+
+       case LWS_CALLBACK_RECEIVE:
+
+               if (((ringbuffer_head - pss->ringbuffer_tail) &
+                                 (MAX_MESSAGE_QUEUE - 1)) == (MAX_MESSAGE_QUEUE - 1)) {
+                       lwsl_err("dropping!\n");
+                       goto choke;
+               }
+
+               if (ringbuffer[ringbuffer_head].payload)
+                       free(ringbuffer[ringbuffer_head].payload);
+
+               ringbuffer[ringbuffer_head].payload =
+                               malloc(LWS_SEND_BUFFER_PRE_PADDING + len +
+                                                 LWS_SEND_BUFFER_POST_PADDING);
+               ringbuffer[ringbuffer_head].len = len;
+               memcpy((char *)ringbuffer[ringbuffer_head].payload +
+                                         LWS_SEND_BUFFER_PRE_PADDING, in, len);
+               if (ringbuffer_head == (MAX_MESSAGE_QUEUE - 1))
+                       ringbuffer_head = 0;
+               else
+                       ringbuffer_head++;
+
+               if (((ringbuffer_head - pss->ringbuffer_tail) &
+                                 (MAX_MESSAGE_QUEUE - 1)) != (MAX_MESSAGE_QUEUE - 2))
+                       goto done;
+
+choke:
+               if (num_wsi_choked < sizeof wsi_choked / sizeof wsi_choked[0]) {
+                       libwebsocket_rx_flow_control(wsi, 0);
+                       wsi_choked[num_wsi_choked++] = wsi;
+               }
+
+//             lwsl_debug("rx fifo %d\n", (ringbuffer_head - pss->ringbuffer_tail) & (MAX_MESSAGE_QUEUE - 1));
+done:
+               libwebsocket_callback_on_writable_all_protocol(
+                                              libwebsockets_get_protocol(wsi));
+               break;
+
+       /*
+        * this just demonstrates how to use the protocol filter. If you won't
+        * study and reject connections based on header content, you don't need
+        * to handle this callback
+        */
+
+       case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION:
+               dump_handshake_info(wsi);
+               /* you could return non-zero here and kill the connection */
+               break;
+
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+
+/* list of supported protocols and callbacks */
+
+static struct libwebsocket_protocols protocols[] = {
+       /* first protocol must always be HTTP handler */
+
+       {
+               "http-only",            /* name */
+               callback_http,          /* callback */
+               sizeof (struct per_session_data__http), /* per_session_data_size */
+               0,                      /* max frame size / rx buffer */
+       },
+       {
+               "dumb-increment-protocol",
+               callback_dumb_increment,
+               sizeof(struct per_session_data__dumb_increment),
+               10,
+       },
+       {
+               "lws-mirror-protocol",
+               callback_lws_mirror,
+               sizeof(struct per_session_data__lws_mirror),
+               128,
+       },
+       { NULL, NULL, 0, 0 } /* terminator */
+};
+
+void sighandler(int sig)
+{
+       force_exit = 1;
+}
+
+static struct option options[] = {
+       { "help",       no_argument,            NULL, 'h' },
+       { "debug",      required_argument,      NULL, 'd' },
+       { "port",       required_argument,      NULL, 'p' },
+       { "ssl",        no_argument,            NULL, 's' },
+       { "interface",  required_argument,      NULL, 'i' },
+       { "closetest",  no_argument,            NULL, 'c' },
+#ifndef LWS_NO_DAEMONIZE
+       { "daemonize",  no_argument,            NULL, 'D' },
+#endif
+       { NULL, 0, 0, 0 }
+};
+
+int main(int argc, char **argv)
+{
+       int n = 0;
+       int use_ssl = 0;
+       struct libwebsocket_context *context;
+       int opts = 0;
+       char interface_name[128] = "";
+       const char *iface = NULL;
+#ifndef WIN32
+       int syslog_options = LOG_PID | LOG_PERROR;
+#endif
+       unsigned int oldus = 0;
+       struct lws_context_creation_info info;
+
+       int debug_level = 7;
+#ifndef LWS_NO_DAEMONIZE
+       int daemonize = 0;
+#endif
+
+       memset(&info, 0, sizeof info);
+       info.port = 7681;
+
+       while (n >= 0) {
+               n = getopt_long(argc, argv, "ci:hsp:d:D", options, NULL);
+               if (n < 0)
+                       continue;
+               switch (n) {
+#ifndef LWS_NO_DAEMONIZE
+               case 'D':
+                       daemonize = 1;
+                       #ifndef WIN32
+                       syslog_options &= ~LOG_PERROR;
+                       #endif
+                       break;
+#endif
+               case 'd':
+                       debug_level = atoi(optarg);
+                       break;
+               case 's':
+                       use_ssl = 1;
+                       break;
+               case 'p':
+                       info.port = atoi(optarg);
+                       break;
+               case 'i':
+                       strncpy(interface_name, optarg, sizeof interface_name);
+                       interface_name[(sizeof interface_name) - 1] = '\0';
+                       iface = interface_name;
+                       break;
+               case 'c':
+                       close_testing = 1;
+                       fprintf(stderr, " Close testing mode -- closes on "
+                                          "client after 50 dumb increments"
+                                          "and suppresses lws_mirror spam\n");
+                       break;
+               case 'h':
+                       fprintf(stderr, "Usage: test-server "
+                                       "[--port=<p>] [--ssl] "
+                                       "[-d <log bitfield>]\n");
+                       exit(1);
+               }
+       }
+
+#if !defined(LWS_NO_DAEMONIZE) && !defined(WIN32)
+       /* 
+        * normally lock path would be /var/lock/lwsts or similar, to
+        * simplify getting started without having to take care about
+        * permissions or running as root, set to /tmp/.lwsts-lock
+        */
+       if (daemonize && lws_daemonize("/tmp/.lwsts-lock")) {
+               fprintf(stderr, "Failed to daemonize\n");
+               return 1;
+       }
+#endif
+
+       signal(SIGINT, sighandler);
+
+#ifndef WIN32
+       /* we will only try to log things according to our debug_level */
+       setlogmask(LOG_UPTO (LOG_DEBUG));
+       openlog("lwsts", syslog_options, LOG_DAEMON);
+#endif
+
+       /* tell the library what debug level to emit and to send it to syslog */
+       lws_set_log_level(debug_level, lwsl_emit_syslog);
+
+       lwsl_notice("libwebsockets test server - "
+                       "(C) Copyright 2010-2013 Andy Green <andy@warmcat.com> - "
+                                                   "licensed under LGPL2.1\n");
+#ifdef EXTERNAL_POLL
+       max_poll_elements = getdtablesize();
+       pollfds = malloc(max_poll_elements * sizeof (struct pollfd));
+       fd_lookup = malloc(max_poll_elements * sizeof (int));
+       if (pollfds == NULL || fd_lookup == NULL) {
+               lwsl_err("Out of memory pollfds=%d\n", max_poll_elements);
+               return -1;
+       }
+#endif
+
+       info.iface = iface;
+       info.protocols = protocols;
+#ifndef LWS_NO_EXTENSIONS
+       info.extensions = libwebsocket_get_internal_extensions();
+#endif
+       if (!use_ssl) {
+               info.ssl_cert_filepath = NULL;
+               info.ssl_private_key_filepath = NULL;
+       } else {
+               info.ssl_cert_filepath = LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem";
+               info.ssl_private_key_filepath = LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem";
+       }
+       info.gid = -1;
+       info.uid = -1;
+       info.options = opts;
+
+       context = libwebsocket_create_context(&info);
+       if (context == NULL) {
+               lwsl_err("libwebsocket init failed\n");
+               return -1;
+       }
+
+       n = 0;
+       while (n >= 0 && !force_exit) {
+               struct timeval tv;
+
+               gettimeofday(&tv, NULL);
+
+               /*
+                * This provokes the LWS_CALLBACK_SERVER_WRITEABLE for every
+                * live websocket connection using the DUMB_INCREMENT protocol,
+                * as soon as it can take more packets (usually immediately)
+                */
+
+               if (((unsigned int)tv.tv_usec - oldus) > 50000) {
+                       libwebsocket_callback_on_writable_all_protocol(&protocols[PROTOCOL_DUMB_INCREMENT]);
+                       oldus = tv.tv_usec;
+               }
+
+#ifdef EXTERNAL_POLL
+
+               /*
+                * this represents an existing server's single poll action
+                * which also includes libwebsocket sockets
+                */
+
+               n = poll(pollfds, count_pollfds, 50);
+               if (n < 0)
+                       continue;
+
+
+               if (n)
+                       for (n = 0; n < count_pollfds; n++)
+                               if (pollfds[n].revents)
+                                       /*
+                                       * returns immediately if the fd does not
+                                       * match anything under libwebsockets
+                                       * control
+                                       */
+                                       if (libwebsocket_service_fd(context,
+                                                                 &pollfds[n]) < 0)
+                                               goto done;
+#else
+               /*
+                * If libwebsockets sockets are all we care about,
+                * you can use this api which takes care of the poll()
+                * and looping through finding who needed service.
+                *
+                * If no socket needs service, it'll return anyway after
+                * the number of ms in the second argument.
+                */
+
+               n = libwebsocket_service(context, 50);
+#endif
+       }
+
+#ifdef EXTERNAL_POLL
+done:
+#endif
+
+       libwebsocket_context_destroy(context);
+
+       lwsl_notice("libwebsockets-test-server exited cleanly\n");
+
+#ifndef WIN32
+       closelog();
+#endif
+
+       return 0;
+}
diff --git a/test-server/test.html b/test-server/test.html
new file mode 100644 (file)
index 0000000..919f46a
--- /dev/null
@@ -0,0 +1,396 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset=utf-8 http-equiv="Content-Language" content="en"/>
+ <title>Minimal Websocket test app</title>
+<style type="text/css">
+       div.title { font-size:18pt; font: Arial; font-weight:normal; text-align:center; color:#000000; }
+       .browser { font-size:18pt; font: Arial; font-weight:normal; text-align:center; color:#ffff00; vertical-align:middle; text-align:center; background:#d0b070; padding:12px; -webkit-border-radius:10px; -moz-border-radius:10px; border-radius:10px;}
+       .group2 { width:600px; vertical-align:middle; text-align:center; background:#f0f0e0; padding:12px; -webkit-border-radius:10px; -moz-border-radius:10px; border-radius:10px; }
+       .explain { vertical-align:middle; text-align:center; background:#f0f0c0; padding:12px; -webkit-border-radius:10px; -moz-border-radius:10px; border-radius:10px; color:#404000; }
+       .content { vertical-align:top; text-align:center; background:#fffff0; padding:12px; -webkit-border-radius:10px; -moz-border-radius:10px; border-radius:10px; }
+       .canvas { vertical-align:top; text-align:center; background:#efefd0; padding:12px; -webkit-border-radius:10px; -moz-border-radius:10px; border-radius:10px; }
+</style>
+</head>
+
+<body>
+<header></header>
+<article>
+
+<table><tr><td>
+
+<table width="100%"><tr><td valign=middle align=center><a href="http://libwebsockets.org"><img src="/libwebsockets.org-logo.png"></a></td><td>
+<section class="browser">Detected Browser: <div id=brow>...</div></section></td></tr></table>
+
+</td></tr><tr><td>
+
+<section id="increment" class="group2">
+<div class="title">libwebsockets "dumb-increment-protocol"</div>
+<table><tr><td>
+<table class="content" width="200px">
+               <tr><td align=center><input type=button id=offset value="Reset counter" onclick="reset();" ></td></tr>
+               <tr><td width=200px align=center><div id=number> </div></td></tr>
+               <tr><td id=wsdi_statustd align=center class="explain"><div id=wsdi_status>Not initialized</div></td></tr>
+       </tr>
+</table>
+</td><td class="explain">
+The incrementing number is coming from the server and is individual for
+each connection to the server... try opening a second browser window.
+<br/><br/>
+The button zeros just this connection's number.
+<br/><br/>
+Click <a href="/leaf.jpg" target="_blank">Here</a> to have the test server send a big picture by http.
+</td></tr></table>
+</section>
+<br>
+<section id="mirror" class="group2">
+<div class="title">libwebsockets "lws-mirror-protocol"</div>
+<div class="explain">
+Use the mouse to draw on the canvas below -- all other browser windows open
+on this page see your drawing in realtime and you can see any of theirs as
+well.
+<br/><br/>
+The lws-mirror protocol doesn't interpret what is being sent to it, it just
+re-sends it to every other websocket it has a connection with using that
+protocol, including the guy who sent the packet.
+<br/><br/>
+<b>libwebsockets-test-client</b> joins in by spamming circles on to this shared canvas when
+run.
+</div>
+<table class="content">
+       <tr>
+               <td>Drawing color:
+               <select id="color" onchange="update_color();">
+                       <option value=#000000>Black</option>
+                       <option value=#0000ff>Blue</option>
+                       <option value=#20ff20>Green</option>
+                       <option value=#802020>Dark Red</option>
+               </select>
+               </td>
+               <td id=wslm_statustd align=center class="explain"><div id=wslm_status>Not initialized</div></td>
+       </tr>
+       <tr>
+               <td colspan=2 width=500 class="content">
+               <div id="wslm_drawing">
+               </div></td>
+       </tr>
+</table>
+</section>
+
+</td></tr><tr><td>
+Looking for support? <a href="http://libwebsockets.org">http://libwebsockets.org</a><br/>
+Join the mailing list: ​<a href="http://ml.libwebsockets.org/mailman/listinfo/libwebsockets">http://ml.libwebsockets.org/mailman/listinfo/libwebsockets</a>
+
+</td></tr></table>
+
+</article>
+
+<script>
+
+/* BrowserDetect came from http://www.quirksmode.org/js/detect.html */
+
+var BrowserDetect = {
+       init: function () {
+               this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
+               this.version = this.searchVersion(navigator.userAgent)
+                       || this.searchVersion(navigator.appVersion)
+                       || "an unknown version";
+               this.OS = this.searchString(this.dataOS) || "an unknown OS";
+       },
+       searchString: function (data) {
+               for (var i=0;i<data.length;i++) {
+                       var dataString = data[i].string;
+                       var dataProp = data[i].prop;
+                       this.versionSearchString = data[i].versionSearch || data[i].identity;
+                       if (dataString) {
+                               if (dataString.indexOf(data[i].subString) != -1)
+                                       return data[i].identity;
+                       }
+                       else if (dataProp)
+                               return data[i].identity;
+               }
+       },
+       searchVersion: function (dataString) {
+               var index = dataString.indexOf(this.versionSearchString);
+               if (index == -1) return;
+               return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
+       },
+       dataBrowser: [
+               {
+                       string: navigator.userAgent,
+                       subString: "Chrome",
+                       identity: "Chrome"
+               },
+               {       string: navigator.userAgent,
+                       subString: "OmniWeb",
+                       versionSearch: "OmniWeb/",
+                       identity: "OmniWeb"
+               },
+               {
+                       string: navigator.vendor,
+                       subString: "Apple",
+                       identity: "Safari",
+                       versionSearch: "Version"
+               },
+               {
+                       prop: window.opera,
+                       identity: "Opera",
+                       versionSearch: "Version"
+               },
+               {
+                       string: navigator.vendor,
+                       subString: "iCab",
+                       identity: "iCab"
+               },
+               {
+                       string: navigator.vendor,
+                       subString: "KDE",
+                       identity: "Konqueror"
+               },
+               {
+                       string: navigator.userAgent,
+                       subString: "Firefox",
+                       identity: "Firefox"
+               },
+               {
+                       string: navigator.vendor,
+                       subString: "Camino",
+                       identity: "Camino"
+               },
+               {               // for newer Netscapes (6+)
+                       string: navigator.userAgent,
+                       subString: "Netscape",
+                       identity: "Netscape"
+               },
+               {
+                       string: navigator.userAgent,
+                       subString: "MSIE",
+                       identity: "Explorer",
+                       versionSearch: "MSIE"
+               },
+               {
+                       string: navigator.userAgent,
+                       subString: "Gecko",
+                       identity: "Mozilla",
+                       versionSearch: "rv"
+               },
+               {               // for older Netscapes (4-)
+                       string: navigator.userAgent,
+                       subString: "Mozilla",
+                       identity: "Netscape",
+                       versionSearch: "Mozilla"
+               }
+       ],
+       dataOS : [
+               {
+                       string: navigator.platform,
+                       subString: "Win",
+                       identity: "Windows"
+               },
+               {
+                       string: navigator.platform,
+                       subString: "Mac",
+                       identity: "Mac"
+               },
+               {
+                          string: navigator.userAgent,
+                          subString: "iPhone",
+                          identity: "iPhone/iPod"
+           },
+               {
+                       string: navigator.platform,
+                       subString: "Linux",
+                       identity: "Linux"
+               }
+       ]
+
+};
+BrowserDetect.init();
+
+document.getElementById("brow").textContent = " " + BrowserDetect.browser + " "
+       + BrowserDetect.version +" " + BrowserDetect.OS +" ";
+
+       var pos = 0;
+
+function get_appropriate_ws_url()
+{
+       var pcol;
+       var u = document.URL;
+
+       /*
+        * We open the websocket encrypted if this page came on an
+        * https:// url itself, otherwise unencrypted
+        */
+
+       if (u.substring(0, 5) == "https") {
+               pcol = "wss://";
+               u = u.substr(8);
+       } else {
+               pcol = "ws://";
+               if (u.substring(0, 4) == "http")
+                       u = u.substr(7);
+       }
+
+       u = u.split('/');
+
+       return pcol + u[0];
+}
+
+
+document.getElementById("number").textContent = get_appropriate_ws_url();
+
+/* dumb increment protocol */
+       
+       var socket_di;
+
+       if (typeof MozWebSocket != "undefined") {
+               socket_di = new MozWebSocket(get_appropriate_ws_url(),
+                                  "dumb-increment-protocol");
+       } else {
+               socket_di = new WebSocket(get_appropriate_ws_url(),
+                                  "dumb-increment-protocol");
+       }
+
+
+       try {
+               socket_di.onopen = function() {
+                       document.getElementById("wsdi_statustd").style.backgroundColor = "#40ff40";
+                       document.getElementById("wsdi_status").textContent = " websocket connection opened ";
+               } 
+
+               socket_di.onmessage =function got_packet(msg) {
+                       document.getElementById("number").textContent = msg.data + "\n";
+               } 
+
+               socket_di.onclose = function(){
+                       document.getElementById("wsdi_statustd").style.backgroundColor = "#ff4040";
+                       document.getElementById("wsdi_status").textContent = " websocket connection CLOSED ";
+               }
+       } catch(exception) {
+               alert('<p>Error' + exception);  
+       }
+
+function reset() {
+       socket_di.send("reset\n");
+}
+
+
+/* lws-mirror protocol */
+
+       var down = 0;
+       var no_last = 1;
+       var last_x = 0, last_y = 0;
+       var ctx;
+       var socket_lm;
+       var color = "#000000";
+
+       if (typeof MozWebSocket != "undefined") {
+               socket_lm = new MozWebSocket(get_appropriate_ws_url(),
+                                  "lws-mirror-protocol");
+       } else {
+               socket_lm = new WebSocket(get_appropriate_ws_url(),
+                                  "lws-mirror-protocol");
+       }
+
+
+       try {
+               socket_lm.onopen = function() {
+                       document.getElementById("wslm_statustd").style.backgroundColor = "#40ff40";
+                       document.getElementById("wslm_status").textContent = " websocket connection opened ";
+               } 
+
+               socket_lm.onmessage =function got_packet(msg) {
+                       j = msg.data.split(';');
+                       f = 0;
+                       while (f < j.length - 1) {
+                               i = j[f].split(' ');
+                               if (i[0] == 'd') {
+                                       ctx.strokeStyle = i[1];
+                                       ctx.beginPath();
+                                       ctx.moveTo(+(i[2]), +(i[3]));
+                                       ctx.lineTo(+(i[4]), +(i[5]));
+                                       ctx.stroke();
+                               }
+                               if (i[0] == 'c') {
+                                       ctx.strokeStyle = i[1];
+                                       ctx.beginPath();
+                                       ctx.arc(+(i[2]), +(i[3]), +(i[4]), 0, Math.PI*2, true); 
+                                       ctx.stroke();
+                               }
+
+                               f++;
+                       }
+               }
+
+               socket_lm.onclose = function(){
+                       document.getElementById("wslm_statustd").style.backgroundColor = "#ff4040";
+                       document.getElementById("wslm_status").textContent = " websocket connection CLOSED ";
+               }
+       } catch(exception) {
+               alert('<p>Error' + exception);  
+       }
+
+       var canvas = document.createElement('canvas');
+       canvas.height = 300;
+       canvas.width = 480;
+       ctx = canvas.getContext("2d");
+
+       document.getElementById('wslm_drawing').appendChild(canvas);
+
+       canvas.addEventListener('mousemove', ev_mousemove, false);
+       canvas.addEventListener('mousedown', ev_mousedown, false);
+       canvas.addEventListener('mouseup', ev_mouseup, false);
+
+       offsetX = offsetY = 0;
+       element = canvas;
+      if (element.offsetParent) {
+        do {
+          offsetX += element.offsetLeft;
+          offsetY += element.offsetTop;
+        } while ((element = element.offsetParent));
+      }
+function update_color() {
+       color = document.getElementById("color").value;
+}
+
+function ev_mousedown (ev) {
+       down = 1;
+}
+
+function ev_mouseup(ev) {
+       down = 0;
+       no_last = 1;
+}
+
+function ev_mousemove (ev) {
+       var x, y;
+
+       if (ev.offsetX) {
+               x = ev.offsetX;
+               y = ev.offsetY;
+       } else {
+               x = ev.layerX - offsetX;
+               y = ev.layerY - offsetY;
+
+       }
+
+       if (!down)
+               return;
+       if (no_last) {
+               no_last = 0;
+               last_x = x;
+               last_y = y;
+               return;
+       }
+       socket_lm.send("d " + color + " " + last_x + " " + last_y + " " + x + ' ' + y + ';');
+
+       last_x = x;
+       last_y = y;
+}
+
+
+</script>
+
+</body>
+</html>
diff --git a/win32port/client/client.vcxproj b/win32port/client/client.vcxproj
new file mode 100644 (file)
index 0000000..1192afc
--- /dev/null
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug static|Win32">\r
+      <Configuration>Debug static</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release DLL|Win32">\r
+      <Configuration>Release DLL</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release DLL|x64">\r
+      <Configuration>Release DLL</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release static|Win32">\r
+      <Configuration>Release static</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\test-server\test-client.c" />\r
+    <ClCompile Include="..\win32helpers\getopt.c" />\r
+    <ClCompile Include="..\win32helpers\getopt_long.c" />\r
+    <ClCompile Include="..\win32helpers\gettimeofday.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\libwebsocketswin32\libwebsocketswin32.vcxproj">\r
+      <Project>{332bf17e-fd30-4363-975a-aa731a827b4f}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\zlib\ZLib.vcxproj">\r
+      <Project>{4156fc56-8443-2973-4fe2-a0bb2c621525}</Project>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\win32helpers\getopt.h" />\r
+    <ClInclude Include="..\win32helpers\gettimeofday.h" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{6265650C-4799-451C-A687-94DE48759A8B}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>client</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release static|Win32'">\r
+    <ClCompile>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_CONSOLE</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">\r
+    <ClCompile>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <BufferSecurityCheck>false</BufferSecurityCheck>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_CONSOLE;LWS_DLL</PreprocessorDefinitions>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/win32port/client/client.vcxproj.filters b/win32port/client/client.vcxproj.filters
new file mode 100644 (file)
index 0000000..76f1121
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\test-server\test-client.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\win32helpers\getopt.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\win32helpers\getopt_long.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\win32helpers\gettimeofday.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\win32helpers\getopt.h">\r
+      <Filter>Source Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\win32helpers\gettimeofday.h">\r
+      <Filter>Source Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters b/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters
new file mode 100644 (file)
index 0000000..f90a232
--- /dev/null
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\lib\base64-decode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\client-handshake.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\handshake.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\libwebsockets.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\parsers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\sha-1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\extension.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\extension-deflate-stream.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\win32helpers\websock-w32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\win32helpers\gettimeofday.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\extension-deflate-frame.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\server-handshake.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\client.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\client-parser.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\minilex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\output.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\server.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\lib\libwebsockets.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\private-libwebsockets.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\extension-deflate-stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\extension-x-google-mux.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\win32helpers\websock-w32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\win32helpers\gettimeofday.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\extension-deflate-frame.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32port/server/server.vcxproj b/win32port/server/server.vcxproj
new file mode 100644 (file)
index 0000000..7fe50a8
--- /dev/null
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug static|Win32">\r
+      <Configuration>Debug static</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release DLL|Win32">\r
+      <Configuration>Release DLL</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release DLL|x64">\r
+      <Configuration>Release DLL</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release static|Win32">\r
+      <Configuration>Release static</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\test-server\test-server.c">\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../win32helpers</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'">../win32helpers</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../win32helpers</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'">../win32helpers</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <ClCompile Include="..\win32helpers\getopt.c" />\r
+    <ClCompile Include="..\win32helpers\getopt_long.c" />\r
+    <ClCompile Include="..\win32helpers\gettimeofday.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\win32helpers\getopt.h" />\r
+    <ClInclude Include="..\win32helpers\gettimeofday.h" />\r
+    <ClInclude Include="..\win32helpers\netdb.h" />\r
+    <ClInclude Include="..\win32helpers\strings.h" />\r
+    <ClInclude Include="..\win32helpers\unistd.h" />\r
+    <ClInclude Include="..\win32helpers\websock-w32.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\libwebsocketswin32\libwebsocketswin32.vcxproj">\r
+      <Project>{332bf17e-fd30-4363-975a-aa731a827b4f}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\zlib\ZLib.vcxproj">\r
+      <Project>{4156fc56-8443-2973-4fe2-a0bb2c621525}</Project>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{E585B64F-9365-4C58-9EF8-56393EB27F8B}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>server</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <IgnoreSpecificDefaultLibraries>\r
+      </IgnoreSpecificDefaultLibraries>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <IgnoreSpecificDefaultLibraries>\r
+      </IgnoreSpecificDefaultLibraries>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <IgnoreSpecificDefaultLibraries>\r
+      </IgnoreSpecificDefaultLibraries>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <IgnoreSpecificDefaultLibraries>\r
+      </IgnoreSpecificDefaultLibraries>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release static|Win32'">\r
+    <ClCompile>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_CONSOLE</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">\r
+    <ClCompile>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <BufferSecurityCheck>false</BufferSecurityCheck>\r
+      <AdditionalIncludeDirectories>../win32helpers</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_CONSOLE;LWS_DLL</PreprocessorDefinitions>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/win32port/server/server.vcxproj.filters b/win32port/server/server.vcxproj.filters
new file mode 100644 (file)
index 0000000..d4a9c7d
--- /dev/null
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\test-server\test-server.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\win32helpers\getopt.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\win32helpers\getopt_long.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\win32helpers\gettimeofday.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\win32helpers\getopt.h">\r
+      <Filter>Source Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\win32helpers\netdb.h">\r
+      <Filter>Source Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\win32helpers\strings.h">\r
+      <Filter>Source Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\win32helpers\unistd.h">\r
+      <Filter>Source Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\win32helpers\websock-w32.h">\r
+      <Filter>Source Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\win32helpers\gettimeofday.h">\r
+      <Filter>Source Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/win32port/win32helpers/getopt.c b/win32port/win32helpers/getopt.c
new file mode 100644 (file)
index 0000000..2181f1c
--- /dev/null
@@ -0,0 +1,153 @@
+/*     $NetBSD: getopt.c,v 1.16 1999/12/02 13:15:56 kleink Exp $       */\r
+\r
+/*\r
+ * Copyright (c) 1987, 1993, 1994\r
+ *     The Regents of the University of California.  All rights reserved.\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions\r
+ * are met:\r
+ * 1. Redistributions of source code must retain the above copyright\r
+ *    notice, this list of conditions and the following disclaimer.\r
+ * 2. Redistributions in binary form must reproduce the above copyright\r
+ *    notice, this list of conditions and the following disclaimer in the\r
+ *    documentation and/or other materials provided with the distribution.\r
+ * 3. All advertising materials mentioning features or use of this software\r
+ *    must display the following acknowledgement:\r
+ *     This product includes software developed by the University of\r
+ *     California, Berkeley and its contributors.\r
+ * 4. Neither the name of the University nor the names of its contributors\r
+ *    may be used to endorse or promote products derived from this software\r
+ *    without specific prior written permission.\r
+ *\r
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\r
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\r
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\r
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\r
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\r
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\r
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\r
+ * SUCH DAMAGE.\r
+ */\r
+\r
+#if 0\r
+static char sccsid[] = "@(#)getopt.c   8.3 (Berkeley) 4/27/95";\r
+#endif\r
+\r
+#include <assert.h>\r
+#include <errno.h>\r
+#include <stdio.h>\r
+#include <string.h>\r
+\r
+#define __P(x) x\r
+#define _DIAGASSERT(x) assert(x)\r
+\r
+#ifdef __weak_alias\r
+__weak_alias(getopt,_getopt);\r
+#endif\r
+\r
+\r
+int    opterr = 1,             /* if error message should be printed */\r
+       optind = 1,             /* index into parent argv vector */\r
+       optopt,                 /* character checked for validity */\r
+       optreset;               /* reset getopt */\r
+char   *optarg;                /* argument associated with option */\r
+\r
+static char * _progname __P((char *));\r
+int getopt_internal __P((int, char * const *, const char *));\r
+\r
+static char *\r
+_progname(nargv0)\r
+       char * nargv0;\r
+{\r
+       char * tmp;\r
+\r
+       _DIAGASSERT(nargv0 != NULL);\r
+\r
+       tmp = strrchr(nargv0, '/');\r
+       if (tmp)\r
+               tmp++;\r
+       else\r
+               tmp = nargv0;\r
+       return(tmp);\r
+}\r
+\r
+#define        BADCH   (int)'?'\r
+#define        BADARG  (int)':'\r
+#define        EMSG    ""\r
+\r
+/*\r
+ * getopt --\r
+ *     Parse argc/argv argument vector.\r
+ */\r
+int\r
+getopt(nargc, nargv, ostr)\r
+       int nargc;\r
+       char * const nargv[];\r
+       const char *ostr;\r
+{\r
+       static char *__progname = 0;\r
+       static char *place = EMSG;              /* option letter processing */\r
+       char *oli;                              /* option letter list index */\r
+        __progname = __progname?__progname:_progname(*nargv);\r
+\r
+       _DIAGASSERT(nargv != NULL);\r
+       _DIAGASSERT(ostr != NULL);\r
+\r
+       if (optreset || !*place) {              /* update scanning pointer */\r
+               optreset = 0;\r
+               if (optind >= nargc || *(place = nargv[optind]) != '-') {\r
+                       place = EMSG;\r
+                       return (-1);\r
+               }\r
+               if (place[1] && *++place == '-' /* found "--" */\r
+                   && place[1] == '\0') {\r
+                       ++optind;\r
+                       place = EMSG;\r
+                       return (-1);\r
+               }\r
+       }                                       /* option letter okay? */\r
+       if ((optopt = (int)*place++) == (int)':' ||\r
+           !(oli = strchr(ostr, optopt))) {\r
+               /*\r
+                * if the user didn't specify '-' as an option,\r
+                * assume it means -1.\r
+                */\r
+               if (optopt == (int)'-')\r
+                       return (-1);\r
+               if (!*place)\r
+                       ++optind;\r
+               if (opterr && *ostr != ':')\r
+                       (void)fprintf(stderr,\r
+                           "%s: illegal option -- %c\n", __progname, optopt);\r
+               return (BADCH);\r
+       }\r
+       if (*++oli != ':') {                    /* don't need argument */\r
+               optarg = NULL;\r
+               if (!*place)\r
+                       ++optind;\r
+       }\r
+       else {                                  /* need an argument */\r
+               if (*place)                     /* no white space */\r
+                       optarg = place;\r
+               else if (nargc <= ++optind) {   /* no arg */\r
+                       place = EMSG;\r
+                       if (*ostr == ':')\r
+                               return (BADARG);\r
+                       if (opterr)\r
+                               (void)fprintf(stderr,\r
+                                   "%s: option requires an argument -- %c\n",\r
+                                   __progname, optopt);\r
+                       return (BADCH);\r
+               }\r
+               else                            /* white space */\r
+                       optarg = nargv[optind];\r
+               place = EMSG;\r
+               ++optind;\r
+       }\r
+       return (optopt);                        /* dump back option letter */\r
+}\r
+\r
diff --git a/win32port/win32helpers/getopt.h b/win32port/win32helpers/getopt.h
new file mode 100644 (file)
index 0000000..5a88c2d
--- /dev/null
@@ -0,0 +1,33 @@
+#ifndef __GETOPT_H__\r
+#define __GETOPT_H__\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+\r
+extern int opterr;             /* if error message should be printed */\r
+extern int optind;             /* index into parent argv vector */\r
+extern int optopt;             /* character checked for validity */\r
+extern int optreset;           /* reset getopt */\r
+extern char *optarg;           /* argument associated with option */\r
+\r
+struct option\r
+{\r
+  const char *name;\r
+  int has_arg;\r
+  int *flag;\r
+  int val;\r
+};\r
+\r
+#define no_argument       0\r
+#define required_argument 1\r
+#define optional_argument 2\r
+\r
+int getopt(int, char**, char*);\r
+int getopt_long(int, char**, char*, struct option*, int*);\r
+\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+\r
+#endif /* __GETOPT_H__ */\r
diff --git a/win32port/win32helpers/getopt_long.c b/win32port/win32helpers/getopt_long.c
new file mode 100644 (file)
index 0000000..43a5cba
--- /dev/null
@@ -0,0 +1,237 @@
+\r
+/*\r
+ * Copyright (c) 1987, 1993, 1994, 1996\r
+ *     The Regents of the University of California.  All rights reserved.\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions\r
+ * are met:\r
+ * 1. Redistributions of source code must retain the above copyright\r
+ *    notice, this list of conditions and the following disclaimer.\r
+ * 2. Redistributions in binary form must reproduce the above copyright\r
+ *    notice, this list of conditions and the following disclaimer in the\r
+ *    documentation and/or other materials provided with the distribution.\r
+ * 3. All advertising materials mentioning features or use of this software\r
+ *    must display the following acknowledgement:\r
+ *     This product includes software developed by the University of\r
+ *     California, Berkeley and its contributors.\r
+ * 4. Neither the name of the University nor the names of its contributors\r
+ *    may be used to endorse or promote products derived from this software\r
+ *    without specific prior written permission.\r
+ *\r
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\r
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\r
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\r
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\r
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\r
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\r
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\r
+ * SUCH DAMAGE.\r
+ */\r
+#include <assert.h>\r
+#include <errno.h>\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+#include "getopt.h"\r
+\r
+extern int       opterr;       /* if error message should be printed */\r
+extern int       optind;       /* index into parent argv vector */\r
+extern int       optopt;       /* character checked for validity */\r
+extern int       optreset;     /* reset getopt */\r
+extern char *optarg;   /* argument associated with option */\r
+\r
+#define __P(x) x\r
+#define _DIAGASSERT(x) assert(x)\r
+\r
+static char * __progname __P((char *));\r
+int getopt_internal __P((int, char * const *, const char *));\r
+\r
+static char *\r
+__progname(nargv0)\r
+       char * nargv0;\r
+{\r
+       char * tmp;\r
+\r
+       _DIAGASSERT(nargv0 != NULL);\r
+\r
+       tmp = strrchr(nargv0, '/');\r
+       if (tmp)\r
+               tmp++;\r
+       else\r
+               tmp = nargv0;\r
+       return(tmp);\r
+}\r
+\r
+#define        BADCH   (int)'?'\r
+#define        BADARG  (int)':'\r
+#define        EMSG    ""\r
+\r
+/*\r
+ * getopt --\r
+ *     Parse argc/argv argument vector.\r
+ */\r
+int\r
+getopt_internal(nargc, nargv, ostr)\r
+       int nargc;\r
+       char * const *nargv;\r
+       const char *ostr;\r
+{\r
+       static char *place = EMSG;              /* option letter processing */\r
+       char *oli;                              /* option letter list index */\r
+\r
+       _DIAGASSERT(nargv != NULL);\r
+       _DIAGASSERT(ostr != NULL);\r
+\r
+       if (optreset || !*place) {              /* update scanning pointer */\r
+               optreset = 0;\r
+               if (optind >= nargc || *(place = nargv[optind]) != '-') {\r
+                       place = EMSG;\r
+                       return (-1);\r
+               }\r
+               if (place[1] && *++place == '-') {      /* found "--" */\r
+                       /* ++optind; */\r
+                       place = EMSG;\r
+                       return (-2);\r
+               }\r
+       }                                       /* option letter okay? */\r
+       if ((optopt = (int)*place++) == (int)':' ||\r
+           !(oli = strchr(ostr, optopt))) {\r
+               /*\r
+                * if the user didn't specify '-' as an option,\r
+                * assume it means -1.\r
+                */\r
+               if (optopt == (int)'-')\r
+                       return (-1);\r
+               if (!*place)\r
+                       ++optind;\r
+               if (opterr && *ostr != ':')\r
+                       (void)fprintf(stderr,\r
+                           "%s: illegal option -- %c\n", __progname(nargv[0]), optopt);\r
+               return (BADCH);\r
+       }\r
+       if (*++oli != ':') {                    /* don't need argument */\r
+               optarg = NULL;\r
+               if (!*place)\r
+                       ++optind;\r
+       } else {                                /* need an argument */\r
+               if (*place)                     /* no white space */\r
+                       optarg = place;\r
+               else if (nargc <= ++optind) {   /* no arg */\r
+                       place = EMSG;\r
+                       if ((opterr) && (*ostr != ':'))\r
+                               (void)fprintf(stderr,\r
+                                   "%s: option requires an argument -- %c\n",\r
+                                   __progname(nargv[0]), optopt);\r
+                       return (BADARG);\r
+               } else                          /* white space */\r
+                       optarg = nargv[optind];\r
+               place = EMSG;\r
+               ++optind;\r
+       }\r
+       return (optopt);                        /* dump back option letter */\r
+}\r
+\r
+#if 0\r
+/*\r
+ * getopt --\r
+ *     Parse argc/argv argument vector.\r
+ */\r
+int\r
+getopt2(nargc, nargv, ostr)\r
+       int nargc;\r
+       char * const *nargv;\r
+       const char *ostr;\r
+{\r
+       int retval;\r
+\r
+       if ((retval = getopt_internal(nargc, nargv, ostr)) == -2) {\r
+               retval = -1;\r
+               ++optind; \r
+       }\r
+       return(retval);\r
+}\r
+#endif\r
+\r
+/*\r
+ * getopt_long --\r
+ *     Parse argc/argv argument vector.\r
+ */\r
+int\r
+getopt_long(nargc, nargv, options, long_options, index)\r
+       int nargc;\r
+       char ** nargv;\r
+       char * options;\r
+       struct option * long_options;\r
+       int * index;\r
+{\r
+       int retval;\r
+\r
+       _DIAGASSERT(nargv != NULL);\r
+       _DIAGASSERT(options != NULL);\r
+       _DIAGASSERT(long_options != NULL);\r
+       /* index may be NULL */\r
+\r
+       if ((retval = getopt_internal(nargc, nargv, options)) == -2) {\r
+               char *current_argv = nargv[optind++] + 2, *has_equal;\r
+               int i, current_argv_len, match = -1;\r
+\r
+               if (*current_argv == '\0') {\r
+                       return(-1);\r
+               }\r
+               if ((has_equal = strchr(current_argv, '=')) != NULL) {\r
+                       current_argv_len = has_equal - current_argv;\r
+                       has_equal++;\r
+               } else\r
+                       current_argv_len = strlen(current_argv);\r
+\r
+               for (i = 0; long_options[i].name; i++) { \r
+                       if (strncmp(current_argv, long_options[i].name, current_argv_len))\r
+                               continue;\r
+\r
+                       if (strlen(long_options[i].name) == (unsigned)current_argv_len) { \r
+                               match = i;\r
+                               break;\r
+                       }\r
+                       if (match == -1)\r
+                               match = i;\r
+               }\r
+               if (match != -1) {\r
+                       if (long_options[match].has_arg == required_argument ||\r
+                           long_options[match].has_arg == optional_argument) {\r
+                               if (has_equal)\r
+                                       optarg = has_equal;\r
+                               else\r
+                                       optarg = nargv[optind++];\r
+                       }\r
+                       if ((long_options[match].has_arg == required_argument)\r
+                           && (optarg == NULL)) {\r
+                               /*\r
+                                * Missing argument, leading :\r
+                                * indicates no error should be generated\r
+                                */\r
+                               if ((opterr) && (*options != ':'))\r
+                                       (void)fprintf(stderr,\r
+                                     "%s: option requires an argument -- %s\n",\r
+                                     __progname(nargv[0]), current_argv);\r
+                               return (BADARG);\r
+                       }\r
+               } else { /* No matching argument */\r
+                       if ((opterr) && (*options != ':'))\r
+                               (void)fprintf(stderr,\r
+                                   "%s: illegal option -- %s\n", __progname(nargv[0]), current_argv);\r
+                       return (BADCH);\r
+               }\r
+               if (long_options[match].flag) {\r
+                       *long_options[match].flag = long_options[match].val;\r
+                       retval = 0;\r
+               } else \r
+                       retval = long_options[match].val;\r
+               if (index)\r
+                       *index = match;\r
+       }\r
+       return(retval);\r
+}\r
diff --git a/win32port/win32helpers/gettimeofday.c b/win32port/win32helpers/gettimeofday.c
new file mode 100644 (file)
index 0000000..18d5a46
--- /dev/null
@@ -0,0 +1,52 @@
+#include <time.h>\r
+#include <windows.h> //I've ommited context line\r
+\r
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)\r
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64\r
+#else\r
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL\r
+#endif\r
+\r
+#ifdef __MINGW32__\r
+#else\r
+ #ifdef __MINGW64__\r
+ #else\r
+struct timezone \r
+{\r
+       int  tz_minuteswest;    /* minutes W of Greenwich */\r
+       int  tz_dsttime;        /* type of dst correction */\r
+};\r
+ #endif\r
+#endif\r
+\r
+int gettimeofday(struct timeval *tv, struct timezone *tz)\r
+{\r
+       FILETIME ft;\r
+       unsigned __int64 tmpres = 0;\r
+       static int tzflag;\r
+\r
+       if (NULL != tv) {\r
+               GetSystemTimeAsFileTime(&ft);\r
+\r
+               tmpres |= ft.dwHighDateTime;\r
+               tmpres <<= 32;\r
+               tmpres |= ft.dwLowDateTime;\r
+\r
+               /*converting file time to unix epoch*/\r
+               tmpres /= 10;  /*convert into microseconds*/\r
+               tmpres -= DELTA_EPOCH_IN_MICROSECS;
+               tv->tv_sec = (long)(tmpres / 1000000UL);\r
+               tv->tv_usec = (long)(tmpres % 1000000UL);\r
+       }\r
\r
+       if (NULL != tz) {\r
+               if (!tzflag) {\r
+                       _tzset();\r
+                       tzflag++;\r
+               }\r
+               tz->tz_minuteswest = _timezone / 60;\r
+               tz->tz_dsttime = _daylight;\r
+       }\r
+\r
+       return 0;\r
+}\r
diff --git a/win32port/win32helpers/gettimeofday.h b/win32port/win32helpers/gettimeofday.h
new file mode 100644 (file)
index 0000000..223ceee
--- /dev/null
@@ -0,0 +1,28 @@
+#ifndef _GET_TIME_OF_DAY_H\r
+#define _GET_TIME_OF_DAY_H\r
+\r
+#ifdef  __MINGW64__\r
+#else\r
+#ifdef  __MINGW32__\r
+#else\r
+#include < time.h >\r
+#endif\r
+#endif\r
+\r
+#include <windows.h> //I've ommited context line.\r
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)\r
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64\r
+#else\r
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL\r
+#endif\r
\r
+struct timezone \r
+{\r
+  int  tz_minuteswest; /* minutes W of Greenwich */\r
+  int  tz_dsttime;     /* type of dst correction */\r
+};\r
\r
+int gettimeofday(struct timeval *tv, struct timezone *tz);\r
+\r
+\r
+#endif\r
diff --git a/win32port/win32helpers/netdb.h b/win32port/win32helpers/netdb.h
new file mode 100644 (file)
index 0000000..45304b7
--- /dev/null
@@ -0,0 +1 @@
+// Left blank for win32
\ No newline at end of file
diff --git a/win32port/win32helpers/strings.h b/win32port/win32helpers/strings.h
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/win32port/win32helpers/sys/time.h b/win32port/win32helpers/sys/time.h
new file mode 100644 (file)
index 0000000..258af63
--- /dev/null
@@ -0,0 +1 @@
+// left blank
\ No newline at end of file
diff --git a/win32port/win32helpers/unistd.h b/win32port/win32helpers/unistd.h
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/win32port/win32helpers/websock-w32.c b/win32port/win32helpers/websock-w32.c
new file mode 100644 (file)
index 0000000..bec150b
--- /dev/null
@@ -0,0 +1,104 @@
+#define FD_SETSIZE 256
+
+#ifdef __MINGW32__
+#include <winsock2.h>
+#else
+#ifdef __MINGW64__
+#include <winsock2.h>
+#else
+#include <WinSock2.h>
+#endif
+#endif
+
+#include <stdlib.h>
+#include <errno.h>
+#include "websock-w32.h"
+
+PFNWSAPOLL poll = NULL;
+
+INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout)
+{
+       fd_set readfds;
+       fd_set writefds;
+       struct timeval tv;
+       struct timeval *ptv = &tv;
+       SOCKET max_socket = 0;
+       ULONG n = 0;
+       int waiting;
+       int pending = 0;
+       WSAPOLLFD * poll_fd = fdarray;
+
+       if (NULL == fdarray) {
+               errno = EFAULT;
+               return -1;
+       }
+
+       FD_ZERO(&readfds);
+       FD_ZERO(&writefds);
+
+       tv.tv_sec = timeout / 1000;
+       tv.tv_usec = (timeout % 1000) * 1000;
+
+       if (timeout < 0)
+               ptv = NULL;
+
+       while (n < nfds) {
+
+               poll_fd->revents = 0;
+
+               if (poll_fd->fd < 0 || !poll_fd->events)
+                       goto skip1;
+
+               if (max_socket < poll_fd->fd)
+                       max_socket = poll_fd->fd;
+
+               if (poll_fd->events & POLLIN)
+                       FD_SET(poll_fd->fd, &readfds);
+
+               if (poll_fd->events & POLLOUT)
+                       FD_SET(poll_fd->fd, &writefds);
+skip1:
+               poll_fd++;
+               n++;
+       }
+
+       waiting = select((int)max_socket + 1, &readfds, &writefds, NULL, ptv);
+
+       if (waiting <= 0)
+               return waiting;
+
+       poll_fd = fdarray;
+
+       while (waiting && nfds--) {
+
+               if (!poll_fd->events)
+                       goto skip2;
+
+               if (poll_fd->fd <= 0) {
+                       poll_fd->revents = POLLNVAL;
+                       goto skip2;
+               }
+
+               if (FD_ISSET(poll_fd->fd, &readfds)) {
+
+                       /* defer POLLHUP / error detect to false read attempt */
+
+                       poll_fd->revents |= POLLIN;
+                       waiting--;
+               }
+
+               if (FD_ISSET(poll_fd->fd, &writefds)) {
+
+                       poll_fd->revents |= poll_fd->events & POLLOUT;
+                       waiting--;
+               }
+
+               if (poll_fd->revents)
+                       pending++;
+
+skip2:
+               poll_fd++;
+       }
+
+       return pending;
+}
diff --git a/win32port/win32helpers/websock-w32.h b/win32port/win32helpers/websock-w32.h
new file mode 100644 (file)
index 0000000..72a4f5c
--- /dev/null
@@ -0,0 +1,62 @@
+#ifndef __WEB_SOCK_W32_H__\r
+#define __WEB_SOCK_W32_H__\r
+\r
+// Windows uses _DEBUG and NDEBUG\r
+#ifdef _DEBUG\r
+#undef DEBUG\r
+#define DEBUG 1\r
+#endif\r
+\r
+#pragma warning(disable : 4996)\r
+\r
+#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)\r
+\r
+#define MSG_NOSIGNAL 0\r
+#define SHUT_RDWR SD_BOTH\r
+\r
+#define SOL_TCP IPPROTO_TCP\r
+\r
+#define random rand\r
+#define usleep _sleep\r
+\r
+#ifdef  __MINGW64__                                                             \r
+#define DEF_POLL_STUFF\r
+#endif\r
+#ifdef  __MINGW32__                                                             \r
+#define DEF_POLL_STUFF\r
+#endif\r
+\r
+#ifdef DEF_POLL_STUFF\r
+\r
+#include <winsock2.h>\r
+\r
+typedef struct pollfd {\r
+       SOCKET fd;\r
+       short  events;\r
+       short  revents;\r
+} WSAPOLLFD, *PWSAPOLLFD, *LPWSAPOLLFD;\r
+\r
+#define POLLIN      0x0001      /* any readable data available   */\r
+#define POLLOUT     0x0004      /* file descriptor is writeable  */\r
+#define POLLERR     0x0008      /* some poll error occurred      */\r
+#define POLLHUP     0x0010      /* file descriptor was "hung up" */\r
+#define POLLNVAL    0x0020             /* requested events "invalid"    */\r
+\r
+#endif\r
+\r
+typedef INT (WSAAPI *PFNWSAPOLL)(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);\r
+extern PFNWSAPOLL poll;\r
+\r
+extern INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);\r
+\r
+/* override configure because we are not using Makefiles */\r
+\r
+#define LWS_NO_FORK\r
+\r
+/* windows can't cope with this idea, needs assets in cwd */\r
+\r
+#ifndef INSTALL_DATADIR\r
+#define INSTALL_DATADIR "."\r
+#endif\r
+\r
+#endif\r
diff --git a/win32port/win32port.sln b/win32port/win32port.sln
new file mode 100644 (file)
index 0000000..fc7ca7c
--- /dev/null
@@ -0,0 +1,100 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 11.00\r
+# Visual C++ Express 2010\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server\server.vcxproj", "{E585B64F-9365-4C58-9EF8-56393EB27F8B}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F} = {332BF17E-FD30-4363-975A-AA731A827B4F}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebsocketswin32", "libwebsocketswin32\libwebsocketswin32.vcxproj", "{332BF17E-FD30-4363-975A-AA731A827B4F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525} = {4156FC56-8443-2973-4FE2-A0BB2C621525}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client\client.vcxproj", "{6265650C-4799-451C-A687-94DE48759A8B}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZLib", "zlib\ZLib.vcxproj", "{4156FC56-8443-2973-4FE2-A0BB2C621525}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug static|Win32 = Debug static|Win32\r
+               Debug static|x64 = Debug static|x64\r
+               Debug|Win32 = Debug|Win32\r
+               Debug|x64 = Debug|x64\r
+               Release DLL|Win32 = Release DLL|Win32\r
+               Release DLL|x64 = Release DLL|x64\r
+               Release static|Win32 = Release static|Win32\r
+               Release static|x64 = Release static|x64\r
+               Release|Win32 = Release|Win32\r
+               Release|x64 = Release|x64\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|Win32.ActiveCfg = Debug static|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|Win32.Build.0 = Debug static|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|x64.ActiveCfg = Debug static|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release DLL|Win32.ActiveCfg = Release DLL|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release DLL|Win32.Build.0 = Release DLL|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release DLL|x64.ActiveCfg = Release DLL|x64\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release DLL|x64.Build.0 = Release DLL|x64\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|Win32.ActiveCfg = Release static|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|Win32.Build.0 = Release static|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|x64.ActiveCfg = Release static|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|Win32.Build.0 = Release|Win32\r
+               {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|x64.ActiveCfg = Release|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|Win32.ActiveCfg = Debug static|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|Win32.Build.0 = Debug static|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|x64.ActiveCfg = Debug static|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release DLL|Win32.ActiveCfg = Release DLL|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release DLL|Win32.Build.0 = Release DLL|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release DLL|x64.ActiveCfg = Release DLL|x64\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release DLL|x64.Build.0 = Release DLL|x64\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|Win32.ActiveCfg = Release static|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|Win32.Build.0 = Release static|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|x64.ActiveCfg = Release static|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|Win32.Build.0 = Release|Win32\r
+               {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|x64.ActiveCfg = Release|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|Win32.ActiveCfg = Debug static|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|Win32.Build.0 = Debug static|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|x64.ActiveCfg = Debug static|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release DLL|Win32.ActiveCfg = Release DLL|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release DLL|Win32.Build.0 = Release DLL|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release DLL|x64.ActiveCfg = Release DLL|x64\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release DLL|x64.Build.0 = Release DLL|x64\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release static|Win32.ActiveCfg = Release static|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release static|Win32.Build.0 = Release static|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release static|x64.ActiveCfg = Release static|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release|Win32.Build.0 = Release|Win32\r
+               {6265650C-4799-451C-A687-94DE48759A8B}.Release|x64.ActiveCfg = Release|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|Win32.ActiveCfg = Debug static|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|Win32.Build.0 = Debug static|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|x64.ActiveCfg = Debug static|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release DLL|Win32.ActiveCfg = Release DLL|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release DLL|Win32.Build.0 = Release DLL|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release DLL|x64.ActiveCfg = Release DLL|x64\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release DLL|x64.Build.0 = Release DLL|x64\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|Win32.ActiveCfg = Release static|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|Win32.Build.0 = Release static|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|x64.ActiveCfg = Release static|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|Win32.Build.0 = Release|Win32\r
+               {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|x64.ActiveCfg = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/win32port/zlib/ZLib.vcxproj b/win32port/zlib/ZLib.vcxproj
new file mode 100644 (file)
index 0000000..0afc43c
--- /dev/null
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug static|Win32">\r
+      <Configuration>Debug static</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release DLL|Win32">\r
+      <Configuration>Release DLL</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release DLL|x64">\r
+      <Configuration>Release DLL</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release static|Win32">\r
+      <Configuration>Release static</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4156FC56-8443-2973-4FE2-A0BB2C621525}</ProjectGuid>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseOfMfc>false</UseOfMfc>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release static|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <OutDir>DebugV10\</OutDir>\r
+    <IntDir>DebugV10\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'">\r
+    <OutDir>$(SolutionDir)..\output\</OutDir>\r
+    <IntDir>DebugV10\</IntDir>\r
+    <TargetName>ZLib_vc100-mt-sgd</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <OutDir>DebugV10\</OutDir>\r
+    <IntDir>DebugV10\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'">\r
+    <OutDir>DebugV10\</OutDir>\r
+    <IntDir>DebugV10\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <IntDir>.\Release\</IntDir>\r
+    <OutDir>.\Release\</OutDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <OutDir>.\Release\</OutDir>\r
+    <IntDir>.\Release\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release static|Win32'">\r
+    <OutDir>$(SolutionDir)..\output\</OutDir>\r
+    <TargetName>ZLib_vc100-mt-s</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">\r
+    <OutDir>$(SolutionDir)..\output\</OutDir>\r
+    <TargetName>ZLib_vc100-mt-s</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <Optimization>Disabled</Optimization>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AssemblerListingLocation>DebugV10\</AssemblerListingLocation>\r
+      <PrecompiledHeaderOutputFile>DebugV10\ZLib.pch</PrecompiledHeaderOutputFile>\r
+      <ObjectFileName>DebugV10\</ObjectFileName>\r
+      <ProgramDataBaseFileName>DebugV10\</ProgramDataBaseFileName>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <Culture>0x1c09</Culture>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+    <Bscmake>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>DebugV10\ZLib.bsc</OutputFile>\r
+    </Bscmake>\r
+    <Lib>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>DebugV10\ZLib.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|Win32'">\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <Optimization>Disabled</Optimization>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AssemblerListingLocation>DebugV10\</AssemblerListingLocation>\r
+      <PrecompiledHeaderOutputFile>DebugV10\ZLib.pch</PrecompiledHeaderOutputFile>\r
+      <ObjectFileName>DebugV10\</ObjectFileName>\r
+      <ProgramDataBaseFileName>DebugV10\</ProgramDataBaseFileName>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <Culture>0x1c09</Culture>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+    <Bscmake>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>DebugV10\ZLib.bsc</OutputFile>\r
+    </Bscmake>\r
+    <Lib>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>$(OutDir)ZLib_vc100-mt-sgd.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <Optimization>Disabled</Optimization>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AssemblerListingLocation>DebugV10\</AssemblerListingLocation>\r
+      <PrecompiledHeaderOutputFile>DebugV10\ZLib.pch</PrecompiledHeaderOutputFile>\r
+      <ObjectFileName>DebugV10\</ObjectFileName>\r
+      <ProgramDataBaseFileName>DebugV10\</ProgramDataBaseFileName>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <Culture>0x1c09</Culture>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+    <Bscmake>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>DebugV10\ZLib.bsc</OutputFile>\r
+    </Bscmake>\r
+    <Lib>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>DebugV10\ZLib.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug static|x64'">\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <Optimization>Disabled</Optimization>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AssemblerListingLocation>DebugV10\</AssemblerListingLocation>\r
+      <PrecompiledHeaderOutputFile>DebugV10\ZLib.pch</PrecompiledHeaderOutputFile>\r
+      <ObjectFileName>DebugV10\</ObjectFileName>\r
+      <ProgramDataBaseFileName>DebugV10\</ProgramDataBaseFileName>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <Culture>0x1c09</Culture>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+    <Bscmake>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>DebugV10\ZLib.bsc</OutputFile>\r
+    </Bscmake>\r
+    <Lib>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>DebugV10\ZLib.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>\r
+      <PrecompiledHeaderOutputFile>.\Release\ZLib.pch</PrecompiledHeaderOutputFile>\r
+      <ObjectFileName>.\Release\</ObjectFileName>\r
+      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <Culture>0x1c09</Culture>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+    <Bscmake>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>.\Release\ZLib.bsc</OutputFile>\r
+    </Bscmake>\r
+    <Lib>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>.\Release\ZLib.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>\r
+      <PrecompiledHeaderOutputFile>.\Release\ZLib.pch</PrecompiledHeaderOutputFile>\r
+      <ObjectFileName>.\Release\</ObjectFileName>\r
+      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <Culture>0x1c09</Culture>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+    <Bscmake>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>.\Release\ZLib.bsc</OutputFile>\r
+    </Bscmake>\r
+    <Lib>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <OutputFile>.\Release\ZLib.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release static|Win32'">\r
+    <Lib>\r
+      <OutputFile>$(OutDir)ZLib_vc100-mt-s.lib</OutputFile>\r
+    </Lib>\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">\r
+    <Lib>\r
+      <OutputFile>$(OutDir)ZLib_vc100-mt-s.lib</OutputFile>\r
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>\r
+    </Lib>\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <ExceptionHandling>false</ExceptionHandling>\r
+      <BufferSecurityCheck>false</BufferSecurityCheck>\r
+      <WholeProgramOptimization>true</WholeProgramOptimization>\r
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
+      <PreprocessorDefinitions>WIN32</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="adler32.c" />\r
+    <ClCompile Include="compress.c" />\r
+    <ClCompile Include="crc32.c" />\r
+    <ClCompile Include="deflate.c" />\r
+    <ClCompile Include="gzclose.c" />\r
+    <ClCompile Include="gzlib.c" />\r
+    <ClCompile Include="gzread.c" />\r
+    <ClCompile Include="gzwrite.c" />\r
+    <ClCompile Include="infback.c" />\r
+    <ClCompile Include="inffast.c" />\r
+    <ClCompile Include="inflate.c" />\r
+    <ClCompile Include="inftrees.c" />\r
+    <ClCompile Include="trees.c" />\r
+    <ClCompile Include="uncompr.c" />\r
+    <ClCompile Include="zutil.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="crc32.h" />\r
+    <ClInclude Include="deflate.h" />\r
+    <ClInclude Include="gzguts.h" />\r
+    <ClInclude Include="inffast.h" />\r
+    <ClInclude Include="inffixed.h" />\r
+    <ClInclude Include="inflate.h" />\r
+    <ClInclude Include="inftrees.h" />\r
+    <ClInclude Include="trees.h" />\r
+    <ClInclude Include="zconf.h" />\r
+    <ClInclude Include="zlib.h" />\r
+    <ClInclude Include="zutil.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/win32port/zlib/ZLib.vcxproj.filters b/win32port/zlib/ZLib.vcxproj.filters
new file mode 100644 (file)
index 0000000..3e6c18d
--- /dev/null
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{2e5deede-b2ef-40bd-950a-a7f7f0fc0413}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{85d35343-9068-43e8-875e-60b528a03c9b}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="adler32.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="compress.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crc32.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="deflate.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="inffast.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="inflate.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="inftrees.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="trees.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="uncompr.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zutil.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="gzlib.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="gzread.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="gzwrite.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="gzclose.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="infback.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="deflate.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="inffast.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="inffixed.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="inftrees.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="trees.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zconf.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zutil.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="gzguts.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="inflate.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crc32.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/win32port/zlib/adler32.c b/win32port/zlib/adler32.c
new file mode 100644 (file)
index 0000000..5f2bc6b
--- /dev/null
@@ -0,0 +1,169 @@
+/* adler32.c -- compute the Adler-32 checksum of a data stream\r
+ * Copyright (C) 1995-2007 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#include "zutil.h"\r
+\r
+#define local static\r
+\r
+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);\r
+\r
+#define BASE 65521UL    /* largest prime smaller than 65536 */\r
+#define NMAX 5552\r
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */\r
+\r
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}\r
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);\r
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);\r
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);\r
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);\r
+\r
+/* use NO_DIVIDE if your processor does not do division in hardware */\r
+#ifdef NO_DIVIDE\r
+#  define MOD(a) \\r
+    do { \\r
+        if (a >= (BASE << 16)) a -= (BASE << 16); \\r
+        if (a >= (BASE << 15)) a -= (BASE << 15); \\r
+        if (a >= (BASE << 14)) a -= (BASE << 14); \\r
+        if (a >= (BASE << 13)) a -= (BASE << 13); \\r
+        if (a >= (BASE << 12)) a -= (BASE << 12); \\r
+        if (a >= (BASE << 11)) a -= (BASE << 11); \\r
+        if (a >= (BASE << 10)) a -= (BASE << 10); \\r
+        if (a >= (BASE << 9)) a -= (BASE << 9); \\r
+        if (a >= (BASE << 8)) a -= (BASE << 8); \\r
+        if (a >= (BASE << 7)) a -= (BASE << 7); \\r
+        if (a >= (BASE << 6)) a -= (BASE << 6); \\r
+        if (a >= (BASE << 5)) a -= (BASE << 5); \\r
+        if (a >= (BASE << 4)) a -= (BASE << 4); \\r
+        if (a >= (BASE << 3)) a -= (BASE << 3); \\r
+        if (a >= (BASE << 2)) a -= (BASE << 2); \\r
+        if (a >= (BASE << 1)) a -= (BASE << 1); \\r
+        if (a >= BASE) a -= BASE; \\r
+    } while (0)\r
+#  define MOD4(a) \\r
+    do { \\r
+        if (a >= (BASE << 4)) a -= (BASE << 4); \\r
+        if (a >= (BASE << 3)) a -= (BASE << 3); \\r
+        if (a >= (BASE << 2)) a -= (BASE << 2); \\r
+        if (a >= (BASE << 1)) a -= (BASE << 1); \\r
+        if (a >= BASE) a -= BASE; \\r
+    } while (0)\r
+#else\r
+#  define MOD(a) a %= BASE\r
+#  define MOD4(a) a %= BASE\r
+#endif\r
+\r
+/* ========================================================================= */\r
+uLong ZEXPORT adler32(adler, buf, len)\r
+    uLong adler;\r
+    const Bytef *buf;\r
+    uInt len;\r
+{\r
+    unsigned long sum2;\r
+    unsigned n;\r
+\r
+    /* split Adler-32 into component sums */\r
+    sum2 = (adler >> 16) & 0xffff;\r
+    adler &= 0xffff;\r
+\r
+    /* in case user likes doing a byte at a time, keep it fast */\r
+    if (len == 1) {\r
+        adler += buf[0];\r
+        if (adler >= BASE)\r
+            adler -= BASE;\r
+        sum2 += adler;\r
+        if (sum2 >= BASE)\r
+            sum2 -= BASE;\r
+        return adler | (sum2 << 16);\r
+    }\r
+\r
+    /* initial Adler-32 value (deferred check for len == 1 speed) */\r
+    if (buf == Z_NULL)\r
+        return 1L;\r
+\r
+    /* in case short lengths are provided, keep it somewhat fast */\r
+    if (len < 16) {\r
+        while (len--) {\r
+            adler += *buf++;\r
+            sum2 += adler;\r
+        }\r
+        if (adler >= BASE)\r
+            adler -= BASE;\r
+        MOD4(sum2);             /* only added so many BASE's */\r
+        return adler | (sum2 << 16);\r
+    }\r
+\r
+    /* do length NMAX blocks -- requires just one modulo operation */\r
+    while (len >= NMAX) {\r
+        len -= NMAX;\r
+        n = NMAX / 16;          /* NMAX is divisible by 16 */\r
+        do {\r
+            DO16(buf);          /* 16 sums unrolled */\r
+            buf += 16;\r
+        } while (--n);\r
+        MOD(adler);\r
+        MOD(sum2);\r
+    }\r
+\r
+    /* do remaining bytes (less than NMAX, still just one modulo) */\r
+    if (len) {                  /* avoid modulos if none remaining */\r
+        while (len >= 16) {\r
+            len -= 16;\r
+            DO16(buf);\r
+            buf += 16;\r
+        }\r
+        while (len--) {\r
+            adler += *buf++;\r
+            sum2 += adler;\r
+        }\r
+        MOD(adler);\r
+        MOD(sum2);\r
+    }\r
+\r
+    /* return recombined sums */\r
+    return adler | (sum2 << 16);\r
+}\r
+\r
+/* ========================================================================= */\r
+local uLong adler32_combine_(adler1, adler2, len2)\r
+    uLong adler1;\r
+    uLong adler2;\r
+    z_off64_t len2;\r
+{\r
+    unsigned long sum1;\r
+    unsigned long sum2;\r
+    unsigned rem;\r
+\r
+    /* the derivation of this formula is left as an exercise for the reader */\r
+    rem = (unsigned)(len2 % BASE);\r
+    sum1 = adler1 & 0xffff;\r
+    sum2 = rem * sum1;\r
+    MOD(sum2);\r
+    sum1 += (adler2 & 0xffff) + BASE - 1;\r
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;\r
+    if (sum1 >= BASE) sum1 -= BASE;\r
+    if (sum1 >= BASE) sum1 -= BASE;\r
+    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);\r
+    if (sum2 >= BASE) sum2 -= BASE;\r
+    return sum1 | (sum2 << 16);\r
+}\r
+\r
+/* ========================================================================= */\r
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)\r
+    uLong adler1;\r
+    uLong adler2;\r
+    z_off_t len2;\r
+{\r
+    return adler32_combine_(adler1, adler2, len2);\r
+}\r
+\r
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)\r
+    uLong adler1;\r
+    uLong adler2;\r
+    z_off64_t len2;\r
+{\r
+    return adler32_combine_(adler1, adler2, len2);\r
+}\r
diff --git a/win32port/zlib/compress.c b/win32port/zlib/compress.c
new file mode 100644 (file)
index 0000000..c46727a
--- /dev/null
@@ -0,0 +1,80 @@
+/* compress.c -- compress a memory buffer\r
+ * Copyright (C) 1995-2005 Jean-loup Gailly.\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#define ZLIB_INTERNAL\r
+#include "zlib.h"\r
+\r
+/* ===========================================================================\r
+     Compresses the source buffer into the destination buffer. The level\r
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte\r
+   length of the source buffer. Upon entry, destLen is the total size of the\r
+   destination buffer, which must be at least 0.1% larger than sourceLen plus\r
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.\r
+\r
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough\r
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,\r
+   Z_STREAM_ERROR if the level parameter is invalid.\r
+*/\r
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)\r
+    Bytef *dest;\r
+    uLongf *destLen;\r
+    const Bytef *source;\r
+    uLong sourceLen;\r
+    int level;\r
+{\r
+    z_stream stream;\r
+    int err;\r
+\r
+    stream.next_in = (Bytef*)source;\r
+    stream.avail_in = (uInt)sourceLen;\r
+#ifdef MAXSEG_64K\r
+    /* Check for source > 64K on 16-bit machine: */\r
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;\r
+#endif\r
+    stream.next_out = dest;\r
+    stream.avail_out = (uInt)*destLen;\r
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;\r
+\r
+    stream.zalloc = (alloc_func)0;\r
+    stream.zfree = (free_func)0;\r
+    stream.opaque = (voidpf)0;\r
+\r
+    err = deflateInit(&stream, level);\r
+    if (err != Z_OK) return err;\r
+\r
+    err = deflate(&stream, Z_FINISH);\r
+    if (err != Z_STREAM_END) {\r
+        deflateEnd(&stream);\r
+        return err == Z_OK ? Z_BUF_ERROR : err;\r
+    }\r
+    *destLen = stream.total_out;\r
+\r
+    err = deflateEnd(&stream);\r
+    return err;\r
+}\r
+\r
+/* ===========================================================================\r
+ */\r
+int ZEXPORT compress (dest, destLen, source, sourceLen)\r
+    Bytef *dest;\r
+    uLongf *destLen;\r
+    const Bytef *source;\r
+    uLong sourceLen;\r
+{\r
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);\r
+}\r
+\r
+/* ===========================================================================\r
+     If the default memLevel or windowBits for deflateInit() is changed, then\r
+   this function needs to be updated.\r
+ */\r
+uLong ZEXPORT compressBound (sourceLen)\r
+    uLong sourceLen;\r
+{\r
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +\r
+           (sourceLen >> 25) + 13;\r
+}\r
diff --git a/win32port/zlib/crc32.c b/win32port/zlib/crc32.c
new file mode 100644 (file)
index 0000000..8cb3d8f
--- /dev/null
@@ -0,0 +1,442 @@
+/* crc32.c -- compute the CRC-32 of a data stream\r
+ * Copyright (C) 1995-2006, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ *\r
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster\r
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing\r
+ * tables for updating the shift register in one step with three exclusive-ors\r
+ * instead of four steps with four exclusive-ors.  This results in about a\r
+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+/*\r
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore\r
+  protection on the static variables used to control the first-use generation\r
+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should\r
+  first call get_crc_table() to initialize the tables before allowing more than\r
+  one thread to use crc32().\r
+ */\r
+\r
+#ifdef MAKECRCH\r
+#  include <stdio.h>\r
+#  ifndef DYNAMIC_CRC_TABLE\r
+#    define DYNAMIC_CRC_TABLE\r
+#  endif /* !DYNAMIC_CRC_TABLE */\r
+#endif /* MAKECRCH */\r
+\r
+#include "zutil.h"      /* for STDC and FAR definitions */\r
+\r
+#define local static\r
+\r
+/* Find a four-byte integer type for crc32_little() and crc32_big(). */\r
+#ifndef NOBYFOUR\r
+#  ifdef STDC           /* need ANSI C limits.h to determine sizes */\r
+#    include <limits.h>\r
+#    define BYFOUR\r
+#    if (UINT_MAX == 0xffffffffUL)\r
+       typedef unsigned int u4;\r
+#    else\r
+#      if (ULONG_MAX == 0xffffffffUL)\r
+         typedef unsigned long u4;\r
+#      else\r
+#        if (USHRT_MAX == 0xffffffffUL)\r
+           typedef unsigned short u4;\r
+#        else\r
+#          undef BYFOUR     /* can't find a four-byte integer type! */\r
+#        endif\r
+#      endif\r
+#    endif\r
+#  endif /* STDC */\r
+#endif /* !NOBYFOUR */\r
+\r
+/* Definitions for doing the crc four data bytes at a time. */\r
+#ifdef BYFOUR\r
+#  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \\r
+                (((w)&0xff00)<<8)+(((w)&0xff)<<24))\r
+   local unsigned long crc32_little OF((unsigned long,\r
+                        const unsigned char FAR *, unsigned));\r
+   local unsigned long crc32_big OF((unsigned long,\r
+                        const unsigned char FAR *, unsigned));\r
+#  define TBLS 8\r
+#else\r
+#  define TBLS 1\r
+#endif /* BYFOUR */\r
+\r
+/* Local functions for crc concatenation */\r
+local unsigned long gf2_matrix_times OF((unsigned long *mat,\r
+                                         unsigned long vec));\r
+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));\r
+local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);\r
+\r
+\r
+#ifdef DYNAMIC_CRC_TABLE\r
+\r
+local volatile int crc_table_empty = 1;\r
+local unsigned long FAR crc_table[TBLS][256];\r
+local void make_crc_table OF((void));\r
+#ifdef MAKECRCH\r
+   local void write_table OF((FILE *, const unsigned long FAR *));\r
+#endif /* MAKECRCH */\r
+/*\r
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:\r
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.\r
+\r
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,\r
+  with the lowest powers in the most significant bit.  Then adding polynomials\r
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by\r
+  one.  If we call the above polynomial p, and represent a byte as the\r
+  polynomial q, also with the lowest power in the most significant bit (so the\r
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,\r
+  where a mod b means the remainder after dividing a by b.\r
+\r
+  This calculation is done using the shift-register method of multiplying and\r
+  taking the remainder.  The register is initialized to zero, and for each\r
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where\r
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by\r
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted\r
+  out is a one).  We start with the highest power (least significant bit) of\r
+  q and repeat for all eight bits of q.\r
+\r
+  The first table is simply the CRC of all possible eight bit values.  This is\r
+  all the information needed to generate CRCs on data a byte at a time for all\r
+  combinations of CRC register values and incoming bytes.  The remaining tables\r
+  allow for word-at-a-time CRC calculation for both big-endian and little-\r
+  endian machines, where a word is four bytes.\r
+*/\r
+local void make_crc_table()\r
+{\r
+    unsigned long c;\r
+    int n, k;\r
+    unsigned long poly;                 /* polynomial exclusive-or pattern */\r
+    /* terms of polynomial defining this crc (except x^32): */\r
+    static volatile int first = 1;      /* flag to limit concurrent making */\r
+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};\r
+\r
+    /* See if another task is already doing this (not thread-safe, but better\r
+       than nothing -- significantly reduces duration of vulnerability in\r
+       case the advice about DYNAMIC_CRC_TABLE is ignored) */\r
+    if (first) {\r
+        first = 0;\r
+\r
+        /* make exclusive-or pattern from polynomial (0xedb88320UL) */\r
+        poly = 0UL;\r
+        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)\r
+            poly |= 1UL << (31 - p[n]);\r
+\r
+        /* generate a crc for every 8-bit value */\r
+        for (n = 0; n < 256; n++) {\r
+            c = (unsigned long)n;\r
+            for (k = 0; k < 8; k++)\r
+                c = c & 1 ? poly ^ (c >> 1) : c >> 1;\r
+            crc_table[0][n] = c;\r
+        }\r
+\r
+#ifdef BYFOUR\r
+        /* generate crc for each value followed by one, two, and three zeros,\r
+           and then the byte reversal of those as well as the first table */\r
+        for (n = 0; n < 256; n++) {\r
+            c = crc_table[0][n];\r
+            crc_table[4][n] = REV(c);\r
+            for (k = 1; k < 4; k++) {\r
+                c = crc_table[0][c & 0xff] ^ (c >> 8);\r
+                crc_table[k][n] = c;\r
+                crc_table[k + 4][n] = REV(c);\r
+            }\r
+        }\r
+#endif /* BYFOUR */\r
+\r
+        crc_table_empty = 0;\r
+    }\r
+    else {      /* not first */\r
+        /* wait for the other guy to finish (not efficient, but rare) */\r
+        while (crc_table_empty)\r
+            ;\r
+    }\r
+\r
+#ifdef MAKECRCH\r
+    /* write out CRC tables to crc32.h */\r
+    {\r
+        FILE *out;\r
+\r
+        out = fopen("crc32.h", "w");\r
+        if (out == NULL) return;\r
+        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");\r
+        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");\r
+        fprintf(out, "local const unsigned long FAR ");\r
+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");\r
+        write_table(out, crc_table[0]);\r
+#  ifdef BYFOUR\r
+        fprintf(out, "#ifdef BYFOUR\n");\r
+        for (k = 1; k < 8; k++) {\r
+            fprintf(out, "  },\n  {\n");\r
+            write_table(out, crc_table[k]);\r
+        }\r
+        fprintf(out, "#endif\n");\r
+#  endif /* BYFOUR */\r
+        fprintf(out, "  }\n};\n");\r
+        fclose(out);\r
+    }\r
+#endif /* MAKECRCH */\r
+}\r
+\r
+#ifdef MAKECRCH\r
+local void write_table(out, table)\r
+    FILE *out;\r
+    const unsigned long FAR *table;\r
+{\r
+    int n;\r
+\r
+    for (n = 0; n < 256; n++)\r
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],\r
+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));\r
+}\r
+#endif /* MAKECRCH */\r
+\r
+#else /* !DYNAMIC_CRC_TABLE */\r
+/* ========================================================================\r
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().\r
+ */\r
+#include "crc32.h"\r
+#endif /* DYNAMIC_CRC_TABLE */\r
+\r
+/* =========================================================================\r
+ * This function can be used by asm versions of crc32()\r
+ */\r
+const unsigned long FAR * ZEXPORT get_crc_table()\r
+{\r
+#ifdef DYNAMIC_CRC_TABLE\r
+    if (crc_table_empty)\r
+        make_crc_table();\r
+#endif /* DYNAMIC_CRC_TABLE */\r
+    return (const unsigned long FAR *)crc_table;\r
+}\r
+\r
+/* ========================================================================= */\r
+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)\r
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1\r
+\r
+/* ========================================================================= */\r
+unsigned long ZEXPORT crc32(crc, buf, len)\r
+    unsigned long crc;\r
+    const unsigned char FAR *buf;\r
+    uInt len;\r
+{\r
+    if (buf == Z_NULL) return 0UL;\r
+\r
+#ifdef DYNAMIC_CRC_TABLE\r
+    if (crc_table_empty)\r
+        make_crc_table();\r
+#endif /* DYNAMIC_CRC_TABLE */\r
+\r
+#ifdef BYFOUR\r
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {\r
+        u4 endian;\r
+\r
+        endian = 1;\r
+        if (*((unsigned char *)(&endian)))\r
+            return crc32_little(crc, buf, len);\r
+        else\r
+            return crc32_big(crc, buf, len);\r
+    }\r
+#endif /* BYFOUR */\r
+    crc = crc ^ 0xffffffffUL;\r
+    while (len >= 8) {\r
+        DO8;\r
+        len -= 8;\r
+    }\r
+    if (len) do {\r
+        DO1;\r
+    } while (--len);\r
+    return crc ^ 0xffffffffUL;\r
+}\r
+\r
+#ifdef BYFOUR\r
+\r
+/* ========================================================================= */\r
+#define DOLIT4 c ^= *buf4++; \\r
+        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \\r
+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]\r
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4\r
+\r
+/* ========================================================================= */\r
+local unsigned long crc32_little(crc, buf, len)\r
+    unsigned long crc;\r
+    const unsigned char FAR *buf;\r
+    unsigned len;\r
+{\r
+    register u4 c;\r
+    register const u4 FAR *buf4;\r
+\r
+    c = (u4)crc;\r
+    c = ~c;\r
+    while (len && ((ptrdiff_t)buf & 3)) {\r
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);\r
+        len--;\r
+    }\r
+\r
+    buf4 = (const u4 FAR *)(const void FAR *)buf;\r
+    while (len >= 32) {\r
+        DOLIT32;\r
+        len -= 32;\r
+    }\r
+    while (len >= 4) {\r
+        DOLIT4;\r
+        len -= 4;\r
+    }\r
+    buf = (const unsigned char FAR *)buf4;\r
+\r
+    if (len) do {\r
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);\r
+    } while (--len);\r
+    c = ~c;\r
+    return (unsigned long)c;\r
+}\r
+\r
+/* ========================================================================= */\r
+#define DOBIG4 c ^= *++buf4; \\r
+        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \\r
+            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]\r
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4\r
+\r
+/* ========================================================================= */\r
+local unsigned long crc32_big(crc, buf, len)\r
+    unsigned long crc;\r
+    const unsigned char FAR *buf;\r
+    unsigned len;\r
+{\r
+    register u4 c;\r
+    register const u4 FAR *buf4;\r
+\r
+    c = REV((u4)crc);\r
+    c = ~c;\r
+    while (len && ((ptrdiff_t)buf & 3)) {\r
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);\r
+        len--;\r
+    }\r
+\r
+    buf4 = (const u4 FAR *)(const void FAR *)buf;\r
+    buf4--;\r
+    while (len >= 32) {\r
+        DOBIG32;\r
+        len -= 32;\r
+    }\r
+    while (len >= 4) {\r
+        DOBIG4;\r
+        len -= 4;\r
+    }\r
+    buf4++;\r
+    buf = (const unsigned char FAR *)buf4;\r
+\r
+    if (len) do {\r
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);\r
+    } while (--len);\r
+    c = ~c;\r
+    return (unsigned long)(REV(c));\r
+}\r
+\r
+#endif /* BYFOUR */\r
+\r
+#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */\r
+\r
+/* ========================================================================= */\r
+local unsigned long gf2_matrix_times(mat, vec)\r
+    unsigned long *mat;\r
+    unsigned long vec;\r
+{\r
+    unsigned long sum;\r
+\r
+    sum = 0;\r
+    while (vec) {\r
+        if (vec & 1)\r
+            sum ^= *mat;\r
+        vec >>= 1;\r
+        mat++;\r
+    }\r
+    return sum;\r
+}\r
+\r
+/* ========================================================================= */\r
+local void gf2_matrix_square(square, mat)\r
+    unsigned long *square;\r
+    unsigned long *mat;\r
+{\r
+    int n;\r
+\r
+    for (n = 0; n < GF2_DIM; n++)\r
+        square[n] = gf2_matrix_times(mat, mat[n]);\r
+}\r
+\r
+/* ========================================================================= */\r
+local uLong crc32_combine_(crc1, crc2, len2)\r
+    uLong crc1;\r
+    uLong crc2;\r
+    z_off64_t len2;\r
+{\r
+    int n;\r
+    unsigned long row;\r
+    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */\r
+    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */\r
+\r
+    /* degenerate case (also disallow negative lengths) */\r
+    if (len2 <= 0)\r
+        return crc1;\r
+\r
+    /* put operator for one zero bit in odd */\r
+    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */\r
+    row = 1;\r
+    for (n = 1; n < GF2_DIM; n++) {\r
+        odd[n] = row;\r
+        row <<= 1;\r
+    }\r
+\r
+    /* put operator for two zero bits in even */\r
+    gf2_matrix_square(even, odd);\r
+\r
+    /* put operator for four zero bits in odd */\r
+    gf2_matrix_square(odd, even);\r
+\r
+    /* apply len2 zeros to crc1 (first square will put the operator for one\r
+       zero byte, eight zero bits, in even) */\r
+    do {\r
+        /* apply zeros operator for this bit of len2 */\r
+        gf2_matrix_square(even, odd);\r
+        if (len2 & 1)\r
+            crc1 = gf2_matrix_times(even, crc1);\r
+        len2 >>= 1;\r
+\r
+        /* if no more bits set, then done */\r
+        if (len2 == 0)\r
+            break;\r
+\r
+        /* another iteration of the loop with odd and even swapped */\r
+        gf2_matrix_square(odd, even);\r
+        if (len2 & 1)\r
+            crc1 = gf2_matrix_times(odd, crc1);\r
+        len2 >>= 1;\r
+\r
+        /* if no more bits set, then done */\r
+    } while (len2 != 0);\r
+\r
+    /* return combined crc */\r
+    crc1 ^= crc2;\r
+    return crc1;\r
+}\r
+\r
+/* ========================================================================= */\r
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)\r
+    uLong crc1;\r
+    uLong crc2;\r
+    z_off_t len2;\r
+{\r
+    return crc32_combine_(crc1, crc2, len2);\r
+}\r
+\r
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)\r
+    uLong crc1;\r
+    uLong crc2;\r
+    z_off64_t len2;\r
+{\r
+    return crc32_combine_(crc1, crc2, len2);\r
+}\r
diff --git a/win32port/zlib/crc32.h b/win32port/zlib/crc32.h
new file mode 100644 (file)
index 0000000..5de49bc
--- /dev/null
@@ -0,0 +1,441 @@
+/* crc32.h -- tables for rapid CRC calculation\r
+ * Generated automatically by crc32.c\r
+ */\r
+\r
+local const unsigned long FAR crc_table[TBLS][256] =\r
+{\r
+  {\r
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,\r
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,\r
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,\r
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,\r
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,\r
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,\r
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,\r
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,\r
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,\r
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,\r
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,\r
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,\r
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,\r
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,\r
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,\r
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,\r
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,\r
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,\r
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,\r
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,\r
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,\r
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,\r
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,\r
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,\r
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,\r
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,\r
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,\r
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,\r
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,\r
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,\r
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,\r
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,\r
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,\r
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,\r
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,\r
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,\r
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,\r
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,\r
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,\r
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,\r
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,\r
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,\r
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,\r
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,\r
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,\r
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,\r
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,\r
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,\r
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,\r
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,\r
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,\r
+    0x2d02ef8dUL\r
+#ifdef BYFOUR\r
+  },\r
+  {\r
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,\r
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,\r
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,\r
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,\r
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,\r
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,\r
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,\r
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,\r
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,\r
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,\r
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,\r
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,\r
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,\r
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,\r
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,\r
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,\r
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,\r
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,\r
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,\r
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,\r
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,\r
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,\r
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,\r
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,\r
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,\r
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,\r
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,\r
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,\r
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,\r
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,\r
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,\r
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,\r
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,\r
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,\r
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,\r
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,\r
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,\r
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,\r
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,\r
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,\r
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,\r
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,\r
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,\r
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,\r
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,\r
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,\r
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,\r
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,\r
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,\r
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,\r
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,\r
+    0x9324fd72UL\r
+  },\r
+  {\r
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,\r
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,\r
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,\r
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,\r
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,\r
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,\r
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,\r
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,\r
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,\r
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,\r
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,\r
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,\r
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,\r
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,\r
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,\r
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,\r
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,\r
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,\r
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,\r
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,\r
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,\r
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,\r
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,\r
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,\r
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,\r
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,\r
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,\r
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,\r
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,\r
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,\r
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,\r
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,\r
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,\r
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,\r
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,\r
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,\r
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,\r
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,\r
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,\r
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,\r
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,\r
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,\r
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,\r
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,\r
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,\r
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,\r
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,\r
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,\r
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,\r
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,\r
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,\r
+    0xbe9834edUL\r
+  },\r
+  {\r
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,\r
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,\r
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,\r
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,\r
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,\r
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,\r
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,\r
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,\r
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,\r
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,\r
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,\r
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,\r
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,\r
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,\r
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,\r
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,\r
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,\r
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,\r
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,\r
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,\r
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,\r
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,\r
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,\r
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,\r
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,\r
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,\r
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,\r
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,\r
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,\r
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,\r
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,\r
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,\r
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,\r
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,\r
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,\r
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,\r
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,\r
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,\r
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,\r
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,\r
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,\r
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,\r
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,\r
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,\r
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,\r
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,\r
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,\r
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,\r
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,\r
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,\r
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,\r
+    0xde0506f1UL\r
+  },\r
+  {\r
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,\r
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,\r
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,\r
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,\r
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,\r
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,\r
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,\r
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,\r
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,\r
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,\r
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,\r
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,\r
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,\r
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,\r
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,\r
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,\r
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,\r
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,\r
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,\r
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,\r
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,\r
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,\r
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,\r
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,\r
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,\r
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,\r
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,\r
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,\r
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,\r
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,\r
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,\r
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,\r
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,\r
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,\r
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,\r
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,\r
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,\r
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,\r
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,\r
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,\r
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,\r
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,\r
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,\r
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,\r
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,\r
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,\r
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,\r
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,\r
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,\r
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,\r
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,\r
+    0x8def022dUL\r
+  },\r
+  {\r
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,\r
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,\r
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,\r
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,\r
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,\r
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,\r
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,\r
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,\r
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,\r
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,\r
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,\r
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,\r
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,\r
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,\r
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,\r
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,\r
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,\r
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,\r
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,\r
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,\r
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,\r
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,\r
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,\r
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,\r
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,\r
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,\r
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,\r
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,\r
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,\r
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,\r
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,\r
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,\r
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,\r
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,\r
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,\r
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,\r
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,\r
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,\r
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,\r
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,\r
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,\r
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,\r
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,\r
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,\r
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,\r
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,\r
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,\r
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,\r
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,\r
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,\r
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,\r
+    0x72fd2493UL\r
+  },\r
+  {\r
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,\r
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,\r
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,\r
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,\r
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,\r
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,\r
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,\r
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,\r
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,\r
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,\r
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,\r
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,\r
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,\r
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,\r
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,\r
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,\r
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,\r
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,\r
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,\r
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,\r
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,\r
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,\r
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,\r
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,\r
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,\r
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,\r
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,\r
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,\r
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,\r
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,\r
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,\r
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,\r
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,\r
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,\r
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,\r
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,\r
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,\r
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,\r
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,\r
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,\r
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,\r
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,\r
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,\r
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,\r
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,\r
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,\r
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,\r
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,\r
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,\r
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,\r
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,\r
+    0xed3498beUL\r
+  },\r
+  {\r
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,\r
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,\r
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,\r
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,\r
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,\r
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,\r
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,\r
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,\r
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,\r
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,\r
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,\r
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,\r
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,\r
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,\r
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,\r
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,\r
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,\r
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,\r
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,\r
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,\r
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,\r
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,\r
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,\r
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,\r
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,\r
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,\r
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,\r
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,\r
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,\r
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,\r
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,\r
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,\r
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,\r
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,\r
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,\r
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,\r
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,\r
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,\r
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,\r
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,\r
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,\r
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,\r
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,\r
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,\r
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,\r
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,\r
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,\r
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,\r
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,\r
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,\r
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,\r
+    0xf10605deUL\r
+#endif\r
+  }\r
+};\r
diff --git a/win32port/zlib/deflate.c b/win32port/zlib/deflate.c
new file mode 100644 (file)
index 0000000..fa00181
--- /dev/null
@@ -0,0 +1,1834 @@
+/* deflate.c -- compress data using the deflation algorithm\r
+ * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/*\r
+ *  ALGORITHM\r
+ *\r
+ *      The "deflation" process depends on being able to identify portions\r
+ *      of the input text which are identical to earlier input (within a\r
+ *      sliding window trailing behind the input currently being processed).\r
+ *\r
+ *      The most straightforward technique turns out to be the fastest for\r
+ *      most input files: try all possible matches and select the longest.\r
+ *      The key feature of this algorithm is that insertions into the string\r
+ *      dictionary are very simple and thus fast, and deletions are avoided\r
+ *      completely. Insertions are performed at each input character, whereas\r
+ *      string matches are performed only when the previous match ends. So it\r
+ *      is preferable to spend more time in matches to allow very fast string\r
+ *      insertions and avoid deletions. The matching algorithm for small\r
+ *      strings is inspired from that of Rabin & Karp. A brute force approach\r
+ *      is used to find longer strings when a small match has been found.\r
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze\r
+ *      (by Leonid Broukhis).\r
+ *         A previous version of this file used a more sophisticated algorithm\r
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized\r
+ *      time, but has a larger average cost, uses more memory and is patented.\r
+ *      However the F&G algorithm may be faster for some highly redundant\r
+ *      files if the parameter max_chain_length (described below) is too large.\r
+ *\r
+ *  ACKNOWLEDGEMENTS\r
+ *\r
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and\r
+ *      I found it in 'freeze' written by Leonid Broukhis.\r
+ *      Thanks to many people for bug reports and testing.\r
+ *\r
+ *  REFERENCES\r
+ *\r
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".\r
+ *      Available in http://www.ietf.org/rfc/rfc1951.txt\r
+ *\r
+ *      A description of the Rabin and Karp algorithm is given in the book\r
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.\r
+ *\r
+ *      Fiala,E.R., and Greene,D.H.\r
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595\r
+ *\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#include "deflate.h"\r
+\r
+const char deflate_copyright[] =\r
+   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";\r
+/*\r
+  If you use the zlib library in a product, an acknowledgment is welcome\r
+  in the documentation of your product. If for some reason you cannot\r
+  include such an acknowledgment, I would appreciate that you keep this\r
+  copyright string in the executable of your product.\r
+ */\r
+\r
+/* ===========================================================================\r
+ *  Function prototypes.\r
+ */\r
+typedef enum {\r
+    need_more,      /* block not completed, need more input or more output */\r
+    block_done,     /* block flush performed */\r
+    finish_started, /* finish started, need only more output at next deflate */\r
+    finish_done     /* finish done, accept no more input or output */\r
+} block_state;\r
+\r
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));\r
+/* Compression function. Returns the block state after the call. */\r
+\r
+local void fill_window    OF((deflate_state *s));\r
+local block_state deflate_stored OF((deflate_state *s, int flush));\r
+local block_state deflate_fast   OF((deflate_state *s, int flush));\r
+#ifndef FASTEST\r
+local block_state deflate_slow   OF((deflate_state *s, int flush));\r
+#endif\r
+local block_state deflate_rle    OF((deflate_state *s, int flush));\r
+local block_state deflate_huff   OF((deflate_state *s, int flush));\r
+local void lm_init        OF((deflate_state *s));\r
+local void putShortMSB    OF((deflate_state *s, uInt b));\r
+local void flush_pending  OF((z_streamp strm));\r
+local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));\r
+#ifdef ASMV\r
+      void match_init OF((void)); /* asm code initialization */\r
+      uInt longest_match  OF((deflate_state *s, IPos cur_match));\r
+#else\r
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));\r
+#endif\r
+\r
+#ifdef DEBUG\r
+local  void check_match OF((deflate_state *s, IPos start, IPos match,\r
+                            int length));\r
+#endif\r
+\r
+/* ===========================================================================\r
+ * Local data\r
+ */\r
+\r
+#define NIL 0\r
+/* Tail of hash chains */\r
+\r
+#ifndef TOO_FAR\r
+#  define TOO_FAR 4096\r
+#endif\r
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */\r
+\r
+/* Values for max_lazy_match, good_match and max_chain_length, depending on\r
+ * the desired pack level (0..9). The values given below have been tuned to\r
+ * exclude worst case performance for pathological files. Better values may be\r
+ * found for specific files.\r
+ */\r
+typedef struct config_s {\r
+   ush good_length; /* reduce lazy search above this match length */\r
+   ush max_lazy;    /* do not perform lazy search above this match length */\r
+   ush nice_length; /* quit search above this match length */\r
+   ush max_chain;\r
+   compress_func func;\r
+} config;\r
+\r
+#ifdef FASTEST\r
+local const config configuration_table[2] = {\r
+/*      good lazy nice chain */\r
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */\r
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */\r
+#else\r
+local const config configuration_table[10] = {\r
+/*      good lazy nice chain */\r
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */\r
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */\r
+/* 2 */ {4,    5, 16,    8, deflate_fast},\r
+/* 3 */ {4,    6, 32,   32, deflate_fast},\r
+\r
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */\r
+/* 5 */ {8,   16, 32,   32, deflate_slow},\r
+/* 6 */ {8,   16, 128, 128, deflate_slow},\r
+/* 7 */ {8,   32, 128, 256, deflate_slow},\r
+/* 8 */ {32, 128, 258, 1024, deflate_slow},\r
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */\r
+#endif\r
+\r
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4\r
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different\r
+ * meaning.\r
+ */\r
+\r
+#define EQUAL 0\r
+/* result of memcmp for equal strings */\r
+\r
+#ifndef NO_DUMMY_DECL\r
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */\r
+#endif\r
+\r
+/* ===========================================================================\r
+ * Update a hash value with the given input byte\r
+ * IN  assertion: all calls to to UPDATE_HASH are made with consecutive\r
+ *    input characters, so that a running hash key can be computed from the\r
+ *    previous key instead of complete recalculation each time.\r
+ */\r
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)\r
+\r
+\r
+/* ===========================================================================\r
+ * Insert string str in the dictionary and set match_head to the previous head\r
+ * of the hash chain (the most recent string with same hash key). Return\r
+ * the previous length of the hash chain.\r
+ * If this file is compiled with -DFASTEST, the compression level is forced\r
+ * to 1, and no hash chains are maintained.\r
+ * IN  assertion: all calls to to INSERT_STRING are made with consecutive\r
+ *    input characters and the first MIN_MATCH bytes of str are valid\r
+ *    (except for the last MIN_MATCH-1 bytes of the input file).\r
+ */\r
+#ifdef FASTEST\r
+#define INSERT_STRING(s, str, match_head) \\r
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \\r
+    match_head = s->head[s->ins_h], \\r
+    s->head[s->ins_h] = (Pos)(str))\r
+#else\r
+#define INSERT_STRING(s, str, match_head) \\r
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \\r
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \\r
+    s->head[s->ins_h] = (Pos)(str))\r
+#endif\r
+\r
+/* ===========================================================================\r
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).\r
+ * prev[] will be initialized on the fly.\r
+ */\r
+#define CLEAR_HASH(s) \\r
+    s->head[s->hash_size-1] = NIL; \\r
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflateInit_(strm, level, version, stream_size)\r
+    z_streamp strm;\r
+    int level;\r
+    const char *version;\r
+    int stream_size;\r
+{\r
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,\r
+                         Z_DEFAULT_STRATEGY, version, stream_size);\r
+    /* To do: ignore strm->next_in if we use it as window */\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,\r
+                  version, stream_size)\r
+    z_streamp strm;\r
+    int  level;\r
+    int  method;\r
+    int  windowBits;\r
+    int  memLevel;\r
+    int  strategy;\r
+    const char *version;\r
+    int stream_size;\r
+{\r
+    deflate_state *s;\r
+    int wrap = 1;\r
+    static const char my_version[] = ZLIB_VERSION;\r
+\r
+    ushf *overlay;\r
+    /* We overlay pending_buf and d_buf+l_buf. This works since the average\r
+     * output size for (length,distance) codes is <= 24 bits.\r
+     */\r
+\r
+    if (version == Z_NULL || version[0] != my_version[0] ||\r
+        stream_size != sizeof(z_stream)) {\r
+        return Z_VERSION_ERROR;\r
+    }\r
+    if (strm == Z_NULL) return Z_STREAM_ERROR;\r
+\r
+    strm->msg = Z_NULL;\r
+    if (strm->zalloc == (alloc_func)0) {\r
+        strm->zalloc = zcalloc;\r
+        strm->opaque = (voidpf)0;\r
+    }\r
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;\r
+\r
+#ifdef FASTEST\r
+    if (level != 0) level = 1;\r
+#else\r
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;\r
+#endif\r
+\r
+    if (windowBits < 0) { /* suppress zlib wrapper */\r
+        wrap = 0;\r
+        windowBits = -windowBits;\r
+    }\r
+#ifdef GZIP\r
+    else if (windowBits > 15) {\r
+        wrap = 2;       /* write gzip wrapper instead */\r
+        windowBits -= 16;\r
+    }\r
+#endif\r
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||\r
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||\r
+        strategy < 0 || strategy > Z_FIXED) {\r
+        return Z_STREAM_ERROR;\r
+    }\r
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */\r
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));\r
+    if (s == Z_NULL) return Z_MEM_ERROR;\r
+    strm->state = (struct internal_state FAR *)s;\r
+    s->strm = strm;\r
+\r
+    s->wrap = wrap;\r
+    s->gzhead = Z_NULL;\r
+    s->w_bits = windowBits;\r
+    s->w_size = 1 << s->w_bits;\r
+    s->w_mask = s->w_size - 1;\r
+\r
+    s->hash_bits = memLevel + 7;\r
+    s->hash_size = 1 << s->hash_bits;\r
+    s->hash_mask = s->hash_size - 1;\r
+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);\r
+\r
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));\r
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));\r
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));\r
+\r
+    s->high_water = 0;      /* nothing written to s->window yet */\r
+\r
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */\r
+\r
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);\r
+    s->pending_buf = (uchf *) overlay;\r
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);\r
+\r
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||\r
+        s->pending_buf == Z_NULL) {\r
+        s->status = FINISH_STATE;\r
+        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);\r
+        deflateEnd (strm);\r
+        return Z_MEM_ERROR;\r
+    }\r
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);\r
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;\r
+\r
+    s->level = level;\r
+    s->strategy = strategy;\r
+    s->method = (Byte)method;\r
+\r
+    return deflateReset(strm);\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)\r
+    z_streamp strm;\r
+    const Bytef *dictionary;\r
+    uInt  dictLength;\r
+{\r
+    deflate_state *s;\r
+    uInt length = dictLength;\r
+    uInt n;\r
+    IPos hash_head = 0;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||\r
+        strm->state->wrap == 2 ||\r
+        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))\r
+        return Z_STREAM_ERROR;\r
+\r
+    s = strm->state;\r
+    if (s->wrap)\r
+        strm->adler = adler32(strm->adler, dictionary, dictLength);\r
+\r
+    if (length < MIN_MATCH) return Z_OK;\r
+    if (length > s->w_size) {\r
+        length = s->w_size;\r
+        dictionary += dictLength - length; /* use the tail of the dictionary */\r
+    }\r
+    zmemcpy(s->window, dictionary, length);\r
+    s->strstart = length;\r
+    s->block_start = (long)length;\r
+\r
+    /* Insert all strings in the hash table (except for the last two bytes).\r
+     * s->lookahead stays null, so s->ins_h will be recomputed at the next\r
+     * call of fill_window.\r
+     */\r
+    s->ins_h = s->window[0];\r
+    UPDATE_HASH(s, s->ins_h, s->window[1]);\r
+    for (n = 0; n <= length - MIN_MATCH; n++) {\r
+        INSERT_STRING(s, n, hash_head);\r
+    }\r
+    if (hash_head) hash_head = 0;  /* to make compiler happy */\r
+    return Z_OK;\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflateReset (strm)\r
+    z_streamp strm;\r
+{\r
+    deflate_state *s;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL ||\r
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {\r
+        return Z_STREAM_ERROR;\r
+    }\r
+\r
+    strm->total_in = strm->total_out = 0;\r
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */\r
+    strm->data_type = Z_UNKNOWN;\r
+\r
+    s = (deflate_state *)strm->state;\r
+    s->pending = 0;\r
+    s->pending_out = s->pending_buf;\r
+\r
+    if (s->wrap < 0) {\r
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */\r
+    }\r
+    s->status = s->wrap ? INIT_STATE : BUSY_STATE;\r
+    strm->adler =\r
+#ifdef GZIP\r
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :\r
+#endif\r
+        adler32(0L, Z_NULL, 0);\r
+    s->last_flush = Z_NO_FLUSH;\r
+\r
+    _tr_init(s);\r
+    lm_init(s);\r
+\r
+    return Z_OK;\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflateSetHeader (strm, head)\r
+    z_streamp strm;\r
+    gz_headerp head;\r
+{\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    if (strm->state->wrap != 2) return Z_STREAM_ERROR;\r
+    strm->state->gzhead = head;\r
+    return Z_OK;\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflatePrime (strm, bits, value)\r
+    z_streamp strm;\r
+    int bits;\r
+    int value;\r
+{\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    strm->state->bi_valid = bits;\r
+    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));\r
+    return Z_OK;\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflateParams(strm, level, strategy)\r
+    z_streamp strm;\r
+    int level;\r
+    int strategy;\r
+{\r
+    deflate_state *s;\r
+    compress_func func;\r
+    int err = Z_OK;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    s = strm->state;\r
+\r
+#ifdef FASTEST\r
+    if (level != 0) level = 1;\r
+#else\r
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;\r
+#endif\r
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {\r
+        return Z_STREAM_ERROR;\r
+    }\r
+    func = configuration_table[s->level].func;\r
+\r
+    if ((strategy != s->strategy || func != configuration_table[level].func) &&\r
+        strm->total_in != 0) {\r
+        /* Flush the last buffer: */\r
+        err = deflate(strm, Z_BLOCK);\r
+    }\r
+    if (s->level != level) {\r
+        s->level = level;\r
+        s->max_lazy_match   = configuration_table[level].max_lazy;\r
+        s->good_match       = configuration_table[level].good_length;\r
+        s->nice_match       = configuration_table[level].nice_length;\r
+        s->max_chain_length = configuration_table[level].max_chain;\r
+    }\r
+    s->strategy = strategy;\r
+    return err;\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)\r
+    z_streamp strm;\r
+    int good_length;\r
+    int max_lazy;\r
+    int nice_length;\r
+    int max_chain;\r
+{\r
+    deflate_state *s;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    s = strm->state;\r
+    s->good_match = good_length;\r
+    s->max_lazy_match = max_lazy;\r
+    s->nice_match = nice_length;\r
+    s->max_chain_length = max_chain;\r
+    return Z_OK;\r
+}\r
+\r
+/* =========================================================================\r
+ * For the default windowBits of 15 and memLevel of 8, this function returns\r
+ * a close to exact, as well as small, upper bound on the compressed size.\r
+ * They are coded as constants here for a reason--if the #define's are\r
+ * changed, then this function needs to be changed as well.  The return\r
+ * value for 15 and 8 only works for those exact settings.\r
+ *\r
+ * For any setting other than those defaults for windowBits and memLevel,\r
+ * the value returned is a conservative worst case for the maximum expansion\r
+ * resulting from using fixed blocks instead of stored blocks, which deflate\r
+ * can emit on compressed data for some combinations of the parameters.\r
+ *\r
+ * This function could be more sophisticated to provide closer upper bounds for\r
+ * every combination of windowBits and memLevel.  But even the conservative\r
+ * upper bound of about 14% expansion does not seem onerous for output buffer\r
+ * allocation.\r
+ */\r
+uLong ZEXPORT deflateBound(strm, sourceLen)\r
+    z_streamp strm;\r
+    uLong sourceLen;\r
+{\r
+    deflate_state *s;\r
+    uLong complen, wraplen;\r
+    Bytef *str;\r
+\r
+    /* conservative upper bound for compressed data */\r
+    complen = sourceLen +\r
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;\r
+\r
+    /* if can't get parameters, return conservative bound plus zlib wrapper */\r
+    if (strm == Z_NULL || strm->state == Z_NULL)\r
+        return complen + 6;\r
+\r
+    /* compute wrapper length */\r
+    s = strm->state;\r
+    switch (s->wrap) {\r
+    case 0:                                 /* raw deflate */\r
+        wraplen = 0;\r
+        break;\r
+    case 1:                                 /* zlib wrapper */\r
+        wraplen = 6 + (s->strstart ? 4 : 0);\r
+        break;\r
+    case 2:                                 /* gzip wrapper */\r
+        wraplen = 18;\r
+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */\r
+            if (s->gzhead->extra != Z_NULL)\r
+                wraplen += 2 + s->gzhead->extra_len;\r
+            str = s->gzhead->name;\r
+            if (str != Z_NULL)\r
+                do {\r
+                    wraplen++;\r
+                } while (*str++);\r
+            str = s->gzhead->comment;\r
+            if (str != Z_NULL)\r
+                do {\r
+                    wraplen++;\r
+                } while (*str++);\r
+            if (s->gzhead->hcrc)\r
+                wraplen += 2;\r
+        }\r
+        break;\r
+    default:                                /* for compiler happiness */\r
+        wraplen = 6;\r
+    }\r
+\r
+    /* if not default parameters, return conservative bound */\r
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)\r
+        return complen + wraplen;\r
+\r
+    /* default settings: return tight bound for that case */\r
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +\r
+           (sourceLen >> 25) + 13 - 6 + wraplen;\r
+}\r
+\r
+/* =========================================================================\r
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.\r
+ * IN assertion: the stream state is correct and there is enough room in\r
+ * pending_buf.\r
+ */\r
+local void putShortMSB (s, b)\r
+    deflate_state *s;\r
+    uInt b;\r
+{\r
+    put_byte(s, (Byte)(b >> 8));\r
+    put_byte(s, (Byte)(b & 0xff));\r
+}\r
+\r
+/* =========================================================================\r
+ * Flush as much pending output as possible. All deflate() output goes\r
+ * through this function so some applications may wish to modify it\r
+ * to avoid allocating a large strm->next_out buffer and copying into it.\r
+ * (See also read_buf()).\r
+ */\r
+local void flush_pending(strm)\r
+    z_streamp strm;\r
+{\r
+    unsigned len = strm->state->pending;\r
+\r
+    if (len > strm->avail_out) len = strm->avail_out;\r
+    if (len == 0) return;\r
+\r
+    zmemcpy(strm->next_out, strm->state->pending_out, len);\r
+    strm->next_out  += len;\r
+    strm->state->pending_out  += len;\r
+    strm->total_out += len;\r
+    strm->avail_out  -= len;\r
+    strm->state->pending -= len;\r
+    if (strm->state->pending == 0) {\r
+        strm->state->pending_out = strm->state->pending_buf;\r
+    }\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflate (strm, flush)\r
+    z_streamp strm;\r
+    int flush;\r
+{\r
+    int old_flush; /* value of flush param for previous deflate call */\r
+    deflate_state *s;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL ||\r
+        flush > Z_BLOCK || flush < 0) {\r
+        return Z_STREAM_ERROR;\r
+    }\r
+    s = strm->state;\r
+\r
+    if (strm->next_out == Z_NULL ||\r
+        (strm->next_in == Z_NULL && strm->avail_in != 0) ||\r
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {\r
+        ERR_RETURN(strm, Z_STREAM_ERROR);\r
+    }\r
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);\r
+\r
+    s->strm = strm; /* just in case */\r
+    old_flush = s->last_flush;\r
+    s->last_flush = flush;\r
+\r
+    /* Write the header */\r
+    if (s->status == INIT_STATE) {\r
+#ifdef GZIP\r
+        if (s->wrap == 2) {\r
+            strm->adler = crc32(0L, Z_NULL, 0);\r
+            put_byte(s, 31);\r
+            put_byte(s, 139);\r
+            put_byte(s, 8);\r
+            if (s->gzhead == Z_NULL) {\r
+                put_byte(s, 0);\r
+                put_byte(s, 0);\r
+                put_byte(s, 0);\r
+                put_byte(s, 0);\r
+                put_byte(s, 0);\r
+                put_byte(s, s->level == 9 ? 2 :\r
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?\r
+                             4 : 0));\r
+                put_byte(s, OS_CODE);\r
+                s->status = BUSY_STATE;\r
+            }\r
+            else {\r
+                put_byte(s, (s->gzhead->text ? 1 : 0) +\r
+                            (s->gzhead->hcrc ? 2 : 0) +\r
+                            (s->gzhead->extra == Z_NULL ? 0 : 4) +\r
+                            (s->gzhead->name == Z_NULL ? 0 : 8) +\r
+                            (s->gzhead->comment == Z_NULL ? 0 : 16)\r
+                        );\r
+                put_byte(s, (Byte)(s->gzhead->time & 0xff));\r
+                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));\r
+                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));\r
+                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));\r
+                put_byte(s, s->level == 9 ? 2 :\r
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?\r
+                             4 : 0));\r
+                put_byte(s, s->gzhead->os & 0xff);\r
+                if (s->gzhead->extra != Z_NULL) {\r
+                    put_byte(s, s->gzhead->extra_len & 0xff);\r
+                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);\r
+                }\r
+                if (s->gzhead->hcrc)\r
+                    strm->adler = crc32(strm->adler, s->pending_buf,\r
+                                        s->pending);\r
+                s->gzindex = 0;\r
+                s->status = EXTRA_STATE;\r
+            }\r
+        }\r
+        else\r
+#endif\r
+        {\r
+            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;\r
+            uInt level_flags;\r
+\r
+            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)\r
+                level_flags = 0;\r
+            else if (s->level < 6)\r
+                level_flags = 1;\r
+            else if (s->level == 6)\r
+                level_flags = 2;\r
+            else\r
+                level_flags = 3;\r
+            header |= (level_flags << 6);\r
+            if (s->strstart != 0) header |= PRESET_DICT;\r
+            header += 31 - (header % 31);\r
+\r
+            s->status = BUSY_STATE;\r
+            putShortMSB(s, header);\r
+\r
+            /* Save the adler32 of the preset dictionary: */\r
+            if (s->strstart != 0) {\r
+                putShortMSB(s, (uInt)(strm->adler >> 16));\r
+                putShortMSB(s, (uInt)(strm->adler & 0xffff));\r
+            }\r
+            strm->adler = adler32(0L, Z_NULL, 0);\r
+        }\r
+    }\r
+#ifdef GZIP\r
+    if (s->status == EXTRA_STATE) {\r
+        if (s->gzhead->extra != Z_NULL) {\r
+            uInt beg = s->pending;  /* start of bytes to update crc */\r
+\r
+            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {\r
+                if (s->pending == s->pending_buf_size) {\r
+                    if (s->gzhead->hcrc && s->pending > beg)\r
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,\r
+                                            s->pending - beg);\r
+                    flush_pending(strm);\r
+                    beg = s->pending;\r
+                    if (s->pending == s->pending_buf_size)\r
+                        break;\r
+                }\r
+                put_byte(s, s->gzhead->extra[s->gzindex]);\r
+                s->gzindex++;\r
+            }\r
+            if (s->gzhead->hcrc && s->pending > beg)\r
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,\r
+                                    s->pending - beg);\r
+            if (s->gzindex == s->gzhead->extra_len) {\r
+                s->gzindex = 0;\r
+                s->status = NAME_STATE;\r
+            }\r
+        }\r
+        else\r
+            s->status = NAME_STATE;\r
+    }\r
+    if (s->status == NAME_STATE) {\r
+        if (s->gzhead->name != Z_NULL) {\r
+            uInt beg = s->pending;  /* start of bytes to update crc */\r
+            int val;\r
+\r
+            do {\r
+                if (s->pending == s->pending_buf_size) {\r
+                    if (s->gzhead->hcrc && s->pending > beg)\r
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,\r
+                                            s->pending - beg);\r
+                    flush_pending(strm);\r
+                    beg = s->pending;\r
+                    if (s->pending == s->pending_buf_size) {\r
+                        val = 1;\r
+                        break;\r
+                    }\r
+                }\r
+                val = s->gzhead->name[s->gzindex++];\r
+                put_byte(s, val);\r
+            } while (val != 0);\r
+            if (s->gzhead->hcrc && s->pending > beg)\r
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,\r
+                                    s->pending - beg);\r
+            if (val == 0) {\r
+                s->gzindex = 0;\r
+                s->status = COMMENT_STATE;\r
+            }\r
+        }\r
+        else\r
+            s->status = COMMENT_STATE;\r
+    }\r
+    if (s->status == COMMENT_STATE) {\r
+        if (s->gzhead->comment != Z_NULL) {\r
+            uInt beg = s->pending;  /* start of bytes to update crc */\r
+            int val;\r
+\r
+            do {\r
+                if (s->pending == s->pending_buf_size) {\r
+                    if (s->gzhead->hcrc && s->pending > beg)\r
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,\r
+                                            s->pending - beg);\r
+                    flush_pending(strm);\r
+                    beg = s->pending;\r
+                    if (s->pending == s->pending_buf_size) {\r
+                        val = 1;\r
+                        break;\r
+                    }\r
+                }\r
+                val = s->gzhead->comment[s->gzindex++];\r
+                put_byte(s, val);\r
+            } while (val != 0);\r
+            if (s->gzhead->hcrc && s->pending > beg)\r
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,\r
+                                    s->pending - beg);\r
+            if (val == 0)\r
+                s->status = HCRC_STATE;\r
+        }\r
+        else\r
+            s->status = HCRC_STATE;\r
+    }\r
+    if (s->status == HCRC_STATE) {\r
+        if (s->gzhead->hcrc) {\r
+            if (s->pending + 2 > s->pending_buf_size)\r
+                flush_pending(strm);\r
+            if (s->pending + 2 <= s->pending_buf_size) {\r
+                put_byte(s, (Byte)(strm->adler & 0xff));\r
+                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));\r
+                strm->adler = crc32(0L, Z_NULL, 0);\r
+                s->status = BUSY_STATE;\r
+            }\r
+        }\r
+        else\r
+            s->status = BUSY_STATE;\r
+    }\r
+#endif\r
+\r
+    /* Flush as much pending output as possible */\r
+    if (s->pending != 0) {\r
+        flush_pending(strm);\r
+        if (strm->avail_out == 0) {\r
+            /* Since avail_out is 0, deflate will be called again with\r
+             * more output space, but possibly with both pending and\r
+             * avail_in equal to zero. There won't be anything to do,\r
+             * but this is not an error situation so make sure we\r
+             * return OK instead of BUF_ERROR at next call of deflate:\r
+             */\r
+            s->last_flush = -1;\r
+            return Z_OK;\r
+        }\r
+\r
+    /* Make sure there is something to do and avoid duplicate consecutive\r
+     * flushes. For repeated and useless calls with Z_FINISH, we keep\r
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.\r
+     */\r
+    } else if (strm->avail_in == 0 && flush <= old_flush &&\r
+               flush != Z_FINISH) {\r
+        ERR_RETURN(strm, Z_BUF_ERROR);\r
+    }\r
+\r
+    /* User must not provide more input after the first FINISH: */\r
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {\r
+        ERR_RETURN(strm, Z_BUF_ERROR);\r
+    }\r
+\r
+    /* Start a new block or continue the current one.\r
+     */\r
+    if (strm->avail_in != 0 || s->lookahead != 0 ||\r
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {\r
+        block_state bstate;\r
+\r
+        bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :\r
+                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :\r
+                        (*(configuration_table[s->level].func))(s, flush));\r
+\r
+        if (bstate == finish_started || bstate == finish_done) {\r
+            s->status = FINISH_STATE;\r
+        }\r
+        if (bstate == need_more || bstate == finish_started) {\r
+            if (strm->avail_out == 0) {\r
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */\r
+            }\r
+            return Z_OK;\r
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call\r
+             * of deflate should use the same flush parameter to make sure\r
+             * that the flush is complete. So we don't have to output an\r
+             * empty block here, this will be done at next call. This also\r
+             * ensures that for a very small output buffer, we emit at most\r
+             * one empty block.\r
+             */\r
+        }\r
+        if (bstate == block_done) {\r
+            if (flush == Z_PARTIAL_FLUSH) {\r
+                _tr_align(s);\r
+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */\r
+                _tr_stored_block(s, (char*)0, 0L, 0);\r
+                /* For a full flush, this empty block will be recognized\r
+                 * as a special marker by inflate_sync().\r
+                 */\r
+                if (flush == Z_FULL_FLUSH) {\r
+                    CLEAR_HASH(s);             /* forget history */\r
+                    if (s->lookahead == 0) {\r
+                        s->strstart = 0;\r
+                        s->block_start = 0L;\r
+                    }\r
+                }\r
+            }\r
+            flush_pending(strm);\r
+            if (strm->avail_out == 0) {\r
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */\r
+              return Z_OK;\r
+            }\r
+        }\r
+    }\r
+    Assert(strm->avail_out > 0, "bug2");\r
+\r
+    if (flush != Z_FINISH) return Z_OK;\r
+    if (s->wrap <= 0) return Z_STREAM_END;\r
+\r
+    /* Write the trailer */\r
+#ifdef GZIP\r
+    if (s->wrap == 2) {\r
+        put_byte(s, (Byte)(strm->adler & 0xff));\r
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));\r
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));\r
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));\r
+        put_byte(s, (Byte)(strm->total_in & 0xff));\r
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));\r
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));\r
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));\r
+    }\r
+    else\r
+#endif\r
+    {\r
+        putShortMSB(s, (uInt)(strm->adler >> 16));\r
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));\r
+    }\r
+    flush_pending(strm);\r
+    /* If avail_out is zero, the application will call deflate again\r
+     * to flush the rest.\r
+     */\r
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */\r
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;\r
+}\r
+\r
+/* ========================================================================= */\r
+int ZEXPORT deflateEnd (strm)\r
+    z_streamp strm;\r
+{\r
+    int status;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+\r
+    status = strm->state->status;\r
+    if (status != INIT_STATE &&\r
+        status != EXTRA_STATE &&\r
+        status != NAME_STATE &&\r
+        status != COMMENT_STATE &&\r
+        status != HCRC_STATE &&\r
+        status != BUSY_STATE &&\r
+        status != FINISH_STATE) {\r
+      return Z_STREAM_ERROR;\r
+    }\r
+\r
+    /* Deallocate in reverse order of allocations: */\r
+    TRY_FREE(strm, strm->state->pending_buf);\r
+    TRY_FREE(strm, strm->state->head);\r
+    TRY_FREE(strm, strm->state->prev);\r
+    TRY_FREE(strm, strm->state->window);\r
+\r
+    ZFREE(strm, strm->state);\r
+    strm->state = Z_NULL;\r
+\r
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;\r
+}\r
+\r
+/* =========================================================================\r
+ * Copy the source state to the destination state.\r
+ * To simplify the source, this is not supported for 16-bit MSDOS (which\r
+ * doesn't have enough memory anyway to duplicate compression states).\r
+ */\r
+int ZEXPORT deflateCopy (dest, source)\r
+    z_streamp dest;\r
+    z_streamp source;\r
+{\r
+#ifdef MAXSEG_64K\r
+    return Z_STREAM_ERROR;\r
+#else\r
+    deflate_state *ds;\r
+    deflate_state *ss;\r
+    ushf *overlay;\r
+\r
+\r
+    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {\r
+        return Z_STREAM_ERROR;\r
+    }\r
+\r
+    ss = source->state;\r
+\r
+    zmemcpy(dest, source, sizeof(z_stream));\r
+\r
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));\r
+    if (ds == Z_NULL) return Z_MEM_ERROR;\r
+    dest->state = (struct internal_state FAR *) ds;\r
+    zmemcpy(ds, ss, sizeof(deflate_state));\r
+    ds->strm = dest;\r
+\r
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));\r
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));\r
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));\r
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);\r
+    ds->pending_buf = (uchf *) overlay;\r
+\r
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||\r
+        ds->pending_buf == Z_NULL) {\r
+        deflateEnd (dest);\r
+        return Z_MEM_ERROR;\r
+    }\r
+    /* following zmemcpy do not work for 16-bit MSDOS */\r
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));\r
+    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));\r
+    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));\r
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);\r
+\r
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);\r
+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);\r
+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;\r
+\r
+    ds->l_desc.dyn_tree = ds->dyn_ltree;\r
+    ds->d_desc.dyn_tree = ds->dyn_dtree;\r
+    ds->bl_desc.dyn_tree = ds->bl_tree;\r
+\r
+    return Z_OK;\r
+#endif /* MAXSEG_64K */\r
+}\r
+\r
+/* ===========================================================================\r
+ * Read a new buffer from the current input stream, update the adler32\r
+ * and total number of bytes read.  All deflate() input goes through\r
+ * this function so some applications may wish to modify it to avoid\r
+ * allocating a large strm->next_in buffer and copying from it.\r
+ * (See also flush_pending()).\r
+ */\r
+local int read_buf(strm, buf, size)\r
+    z_streamp strm;\r
+    Bytef *buf;\r
+    unsigned size;\r
+{\r
+    unsigned len = strm->avail_in;\r
+\r
+    if (len > size) len = size;\r
+    if (len == 0) return 0;\r
+\r
+    strm->avail_in  -= len;\r
+\r
+    if (strm->state->wrap == 1) {\r
+        strm->adler = adler32(strm->adler, strm->next_in, len);\r
+    }\r
+#ifdef GZIP\r
+    else if (strm->state->wrap == 2) {\r
+        strm->adler = crc32(strm->adler, strm->next_in, len);\r
+    }\r
+#endif\r
+    zmemcpy(buf, strm->next_in, len);\r
+    strm->next_in  += len;\r
+    strm->total_in += len;\r
+\r
+    return (int)len;\r
+}\r
+\r
+/* ===========================================================================\r
+ * Initialize the "longest match" routines for a new zlib stream\r
+ */\r
+local void lm_init (s)\r
+    deflate_state *s;\r
+{\r
+    s->window_size = (ulg)2L*s->w_size;\r
+\r
+    CLEAR_HASH(s);\r
+\r
+    /* Set the default configuration parameters:\r
+     */\r
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;\r
+    s->good_match       = configuration_table[s->level].good_length;\r
+    s->nice_match       = configuration_table[s->level].nice_length;\r
+    s->max_chain_length = configuration_table[s->level].max_chain;\r
+\r
+    s->strstart = 0;\r
+    s->block_start = 0L;\r
+    s->lookahead = 0;\r
+    s->match_length = s->prev_length = MIN_MATCH-1;\r
+    s->match_available = 0;\r
+    s->ins_h = 0;\r
+#ifndef FASTEST\r
+#ifdef ASMV\r
+    match_init(); /* initialize the asm code */\r
+#endif\r
+#endif\r
+}\r
+\r
+#ifndef FASTEST\r
+/* ===========================================================================\r
+ * Set match_start to the longest match starting at the given string and\r
+ * return its length. Matches shorter or equal to prev_length are discarded,\r
+ * in which case the result is equal to prev_length and match_start is\r
+ * garbage.\r
+ * IN assertions: cur_match is the head of the hash chain for the current\r
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1\r
+ * OUT assertion: the match length is not greater than s->lookahead.\r
+ */\r
+#ifndef ASMV\r
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or\r
+ * match.S. The code will be functionally equivalent.\r
+ */\r
+local uInt longest_match(s, cur_match)\r
+    deflate_state *s;\r
+    IPos cur_match;                             /* current match */\r
+{\r
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */\r
+    register Bytef *scan = s->window + s->strstart; /* current string */\r
+    register Bytef *match;                       /* matched string */\r
+    register int len;                           /* length of current match */\r
+    int best_len = s->prev_length;              /* best match length so far */\r
+    int nice_match = s->nice_match;             /* stop if match long enough */\r
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?\r
+        s->strstart - (IPos)MAX_DIST(s) : NIL;\r
+    /* Stop when cur_match becomes <= limit. To simplify the code,\r
+     * we prevent matches with the string of window index 0.\r
+     */\r
+    Posf *prev = s->prev;\r
+    uInt wmask = s->w_mask;\r
+\r
+#ifdef UNALIGNED_OK\r
+    /* Compare two bytes at a time. Note: this is not always beneficial.\r
+     * Try with and without -DUNALIGNED_OK to check.\r
+     */\r
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;\r
+    register ush scan_start = *(ushf*)scan;\r
+    register ush scan_end   = *(ushf*)(scan+best_len-1);\r
+#else\r
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;\r
+    register Byte scan_end1  = scan[best_len-1];\r
+    register Byte scan_end   = scan[best_len];\r
+#endif\r
+\r
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.\r
+     * It is easy to get rid of this optimization if necessary.\r
+     */\r
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");\r
+\r
+    /* Do not waste too much time if we already have a good match: */\r
+    if (s->prev_length >= s->good_match) {\r
+        chain_length >>= 2;\r
+    }\r
+    /* Do not look for matches beyond the end of the input. This is necessary\r
+     * to make deflate deterministic.\r
+     */\r
+    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;\r
+\r
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");\r
+\r
+    do {\r
+        Assert(cur_match < s->strstart, "no future");\r
+        match = s->window + cur_match;\r
+\r
+        /* Skip to next match if the match length cannot increase\r
+         * or if the match length is less than 2.  Note that the checks below\r
+         * for insufficient lookahead only occur occasionally for performance\r
+         * reasons.  Therefore uninitialized memory will be accessed, and\r
+         * conditional jumps will be made that depend on those values.\r
+         * However the length of the match is limited to the lookahead, so\r
+         * the output of deflate is not affected by the uninitialized values.\r
+         */\r
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)\r
+        /* This code assumes sizeof(unsigned short) == 2. Do not use\r
+         * UNALIGNED_OK if your compiler uses a different size.\r
+         */\r
+        if (*(ushf*)(match+best_len-1) != scan_end ||\r
+            *(ushf*)match != scan_start) continue;\r
+\r
+        /* It is not necessary to compare scan[2] and match[2] since they are\r
+         * always equal when the other bytes match, given that the hash keys\r
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at\r
+         * strstart+3, +5, ... up to strstart+257. We check for insufficient\r
+         * lookahead only every 4th comparison; the 128th check will be made\r
+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is\r
+         * necessary to put more guard bytes at the end of the window, or\r
+         * to check more often for insufficient lookahead.\r
+         */\r
+        Assert(scan[2] == match[2], "scan[2]?");\r
+        scan++, match++;\r
+        do {\r
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&\r
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&\r
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&\r
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&\r
+                 scan < strend);\r
+        /* The funny "do {}" generates better code on most compilers */\r
+\r
+        /* Here, scan <= window+strstart+257 */\r
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");\r
+        if (*scan == *match) scan++;\r
+\r
+        len = (MAX_MATCH - 1) - (int)(strend-scan);\r
+        scan = strend - (MAX_MATCH-1);\r
+\r
+#else /* UNALIGNED_OK */\r
+\r
+        if (match[best_len]   != scan_end  ||\r
+            match[best_len-1] != scan_end1 ||\r
+            *match            != *scan     ||\r
+            *++match          != scan[1])      continue;\r
+\r
+        /* The check at best_len-1 can be removed because it will be made\r
+         * again later. (This heuristic is not always a win.)\r
+         * It is not necessary to compare scan[2] and match[2] since they\r
+         * are always equal when the other bytes match, given that\r
+         * the hash keys are equal and that HASH_BITS >= 8.\r
+         */\r
+        scan += 2, match++;\r
+        Assert(*scan == *match, "match[2]?");\r
+\r
+        /* We check for insufficient lookahead only every 8th comparison;\r
+         * the 256th check will be made at strstart+258.\r
+         */\r
+        do {\r
+        } while (*++scan == *++match && *++scan == *++match &&\r
+                 *++scan == *++match && *++scan == *++match &&\r
+                 *++scan == *++match && *++scan == *++match &&\r
+                 *++scan == *++match && *++scan == *++match &&\r
+                 scan < strend);\r
+\r
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");\r
+\r
+        len = MAX_MATCH - (int)(strend - scan);\r
+        scan = strend - MAX_MATCH;\r
+\r
+#endif /* UNALIGNED_OK */\r
+\r
+        if (len > best_len) {\r
+            s->match_start = cur_match;\r
+            best_len = len;\r
+            if (len >= nice_match) break;\r
+#ifdef UNALIGNED_OK\r
+            scan_end = *(ushf*)(scan+best_len-1);\r
+#else\r
+            scan_end1  = scan[best_len-1];\r
+            scan_end   = scan[best_len];\r
+#endif\r
+        }\r
+    } while ((cur_match = prev[cur_match & wmask]) > limit\r
+             && --chain_length != 0);\r
+\r
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;\r
+    return s->lookahead;\r
+}\r
+#endif /* ASMV */\r
+\r
+#else /* FASTEST */\r
+\r
+/* ---------------------------------------------------------------------------\r
+ * Optimized version for FASTEST only\r
+ */\r
+local uInt longest_match(s, cur_match)\r
+    deflate_state *s;\r
+    IPos cur_match;                             /* current match */\r
+{\r
+    register Bytef *scan = s->window + s->strstart; /* current string */\r
+    register Bytef *match;                       /* matched string */\r
+    register int len;                           /* length of current match */\r
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;\r
+\r
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.\r
+     * It is easy to get rid of this optimization if necessary.\r
+     */\r
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");\r
+\r
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");\r
+\r
+    Assert(cur_match < s->strstart, "no future");\r
+\r
+    match = s->window + cur_match;\r
+\r
+    /* Return failure if the match length is less than 2:\r
+     */\r
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;\r
+\r
+    /* The check at best_len-1 can be removed because it will be made\r
+     * again later. (This heuristic is not always a win.)\r
+     * It is not necessary to compare scan[2] and match[2] since they\r
+     * are always equal when the other bytes match, given that\r
+     * the hash keys are equal and that HASH_BITS >= 8.\r
+     */\r
+    scan += 2, match += 2;\r
+    Assert(*scan == *match, "match[2]?");\r
+\r
+    /* We check for insufficient lookahead only every 8th comparison;\r
+     * the 256th check will be made at strstart+258.\r
+     */\r
+    do {\r
+    } while (*++scan == *++match && *++scan == *++match &&\r
+             *++scan == *++match && *++scan == *++match &&\r
+             *++scan == *++match && *++scan == *++match &&\r
+             *++scan == *++match && *++scan == *++match &&\r
+             scan < strend);\r
+\r
+    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");\r
+\r
+    len = MAX_MATCH - (int)(strend - scan);\r
+\r
+    if (len < MIN_MATCH) return MIN_MATCH - 1;\r
+\r
+    s->match_start = cur_match;\r
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;\r
+}\r
+\r
+#endif /* FASTEST */\r
+\r
+#ifdef DEBUG\r
+/* ===========================================================================\r
+ * Check that the match at match_start is indeed a match.\r
+ */\r
+local void check_match(s, start, match, length)\r
+    deflate_state *s;\r
+    IPos start, match;\r
+    int length;\r
+{\r
+    /* check that the match is indeed a match */\r
+    if (zmemcmp(s->window + match,\r
+                s->window + start, length) != EQUAL) {\r
+        fprintf(stderr, " start %u, match %u, length %d\n",\r
+                start, match, length);\r
+        do {\r
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);\r
+        } while (--length != 0);\r
+        z_error("invalid match");\r
+    }\r
+    if (z_verbose > 1) {\r
+        fprintf(stderr,"\\[%d,%d]", start-match, length);\r
+        do { putc(s->window[start++], stderr); } while (--length != 0);\r
+    }\r
+}\r
+#else\r
+#  define check_match(s, start, match, length)\r
+#endif /* DEBUG */\r
+\r
+/* ===========================================================================\r
+ * Fill the window when the lookahead becomes insufficient.\r
+ * Updates strstart and lookahead.\r
+ *\r
+ * IN assertion: lookahead < MIN_LOOKAHEAD\r
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD\r
+ *    At least one byte has been read, or avail_in == 0; reads are\r
+ *    performed for at least two bytes (required for the zip translate_eol\r
+ *    option -- not supported here).\r
+ */\r
+local void fill_window(s)\r
+    deflate_state *s;\r
+{\r
+    register unsigned n, m;\r
+    register Posf *p;\r
+    unsigned more;    /* Amount of free space at the end of the window. */\r
+    uInt wsize = s->w_size;\r
+\r
+    do {\r
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);\r
+\r
+        /* Deal with !@#$% 64K limit: */\r
+        if (sizeof(int) <= 2) {\r
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {\r
+                more = wsize;\r
+\r
+            } else if (more == (unsigned)(-1)) {\r
+                /* Very unlikely, but possible on 16 bit machine if\r
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)\r
+                 */\r
+                more--;\r
+            }\r
+        }\r
+\r
+        /* If the window is almost full and there is insufficient lookahead,\r
+         * move the upper half to the lower one to make room in the upper half.\r
+         */\r
+        if (s->strstart >= wsize+MAX_DIST(s)) {\r
+\r
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);\r
+            s->match_start -= wsize;\r
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */\r
+            s->block_start -= (long) wsize;\r
+\r
+            /* Slide the hash table (could be avoided with 32 bit values\r
+               at the expense of memory usage). We slide even when level == 0\r
+               to keep the hash table consistent if we switch back to level > 0\r
+               later. (Using level 0 permanently is not an optimal usage of\r
+               zlib, so we don't care about this pathological case.)\r
+             */\r
+            n = s->hash_size;\r
+            p = &s->head[n];\r
+            do {\r
+                m = *--p;\r
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);\r
+            } while (--n);\r
+\r
+            n = wsize;\r
+#ifndef FASTEST\r
+            p = &s->prev[n];\r
+            do {\r
+                m = *--p;\r
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);\r
+                /* If n is not on any hash chain, prev[n] is garbage but\r
+                 * its value will never be used.\r
+                 */\r
+            } while (--n);\r
+#endif\r
+            more += wsize;\r
+        }\r
+        if (s->strm->avail_in == 0) return;\r
+\r
+        /* If there was no sliding:\r
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&\r
+         *    more == window_size - lookahead - strstart\r
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)\r
+         * => more >= window_size - 2*WSIZE + 2\r
+         * In the BIG_MEM or MMAP case (not yet supported),\r
+         *   window_size == input_size + MIN_LOOKAHEAD  &&\r
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.\r
+         * Otherwise, window_size == 2*WSIZE so more >= 2.\r
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.\r
+         */\r
+        Assert(more >= 2, "more < 2");\r
+\r
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);\r
+        s->lookahead += n;\r
+\r
+        /* Initialize the hash value now that we have some input: */\r
+        if (s->lookahead >= MIN_MATCH) {\r
+            s->ins_h = s->window[s->strstart];\r
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);\r
+#if MIN_MATCH != 3\r
+            Call UPDATE_HASH() MIN_MATCH-3 more times\r
+#endif\r
+        }\r
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,\r
+         * but this is not important since only literal bytes will be emitted.\r
+         */\r
+\r
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);\r
+\r
+    /* If the WIN_INIT bytes after the end of the current data have never been\r
+     * written, then zero those bytes in order to avoid memory check reports of\r
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by\r
+     * the longest match routines.  Update the high water mark for the next\r
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match\r
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.\r
+     */\r
+    if (s->high_water < s->window_size) {\r
+        ulg curr = s->strstart + (ulg)(s->lookahead);\r
+        ulg init;\r
+\r
+        if (s->high_water < curr) {\r
+            /* Previous high water mark below current data -- zero WIN_INIT\r
+             * bytes or up to end of window, whichever is less.\r
+             */\r
+            init = s->window_size - curr;\r
+            if (init > WIN_INIT)\r
+                init = WIN_INIT;\r
+            zmemzero(s->window + curr, (unsigned)init);\r
+            s->high_water = curr + init;\r
+        }\r
+        else if (s->high_water < (ulg)curr + WIN_INIT) {\r
+            /* High water mark at or above current data, but below current data\r
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up\r
+             * to end of window, whichever is less.\r
+             */\r
+            init = (ulg)curr + WIN_INIT - s->high_water;\r
+            if (init > s->window_size - s->high_water)\r
+                init = s->window_size - s->high_water;\r
+            zmemzero(s->window + s->high_water, (unsigned)init);\r
+            s->high_water += init;\r
+        }\r
+    }\r
+}\r
+\r
+/* ===========================================================================\r
+ * Flush the current block, with given end-of-file flag.\r
+ * IN assertion: strstart is set to the end of the current match.\r
+ */\r
+#define FLUSH_BLOCK_ONLY(s, last) { \\r
+   _tr_flush_block(s, (s->block_start >= 0L ? \\r
+                   (charf *)&s->window[(unsigned)s->block_start] : \\r
+                   (charf *)Z_NULL), \\r
+                (ulg)((long)s->strstart - s->block_start), \\r
+                (last)); \\r
+   s->block_start = s->strstart; \\r
+   flush_pending(s->strm); \\r
+   Tracev((stderr,"[FLUSH]")); \\r
+}\r
+\r
+/* Same but force premature exit if necessary. */\r
+#define FLUSH_BLOCK(s, last) { \\r
+   FLUSH_BLOCK_ONLY(s, last); \\r
+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \\r
+}\r
+\r
+/* ===========================================================================\r
+ * Copy without compression as much as possible from the input stream, return\r
+ * the current block state.\r
+ * This function does not insert new strings in the dictionary since\r
+ * uncompressible data is probably not useful. This function is used\r
+ * only for the level=0 compression option.\r
+ * NOTE: this function should be optimized to avoid extra copying from\r
+ * window to pending_buf.\r
+ */\r
+local block_state deflate_stored(s, flush)\r
+    deflate_state *s;\r
+    int flush;\r
+{\r
+    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited\r
+     * to pending_buf_size, and each stored block has a 5 byte header:\r
+     */\r
+    ulg max_block_size = 0xffff;\r
+    ulg max_start;\r
+\r
+    if (max_block_size > s->pending_buf_size - 5) {\r
+        max_block_size = s->pending_buf_size - 5;\r
+    }\r
+\r
+    /* Copy as much as possible from input to output: */\r
+    for (;;) {\r
+        /* Fill the window as much as possible: */\r
+        if (s->lookahead <= 1) {\r
+\r
+            Assert(s->strstart < s->w_size+MAX_DIST(s) ||\r
+                   s->block_start >= (long)s->w_size, "slide too late");\r
+\r
+            fill_window(s);\r
+            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;\r
+\r
+            if (s->lookahead == 0) break; /* flush the current block */\r
+        }\r
+        Assert(s->block_start >= 0L, "block gone");\r
+\r
+        s->strstart += s->lookahead;\r
+        s->lookahead = 0;\r
+\r
+        /* Emit a stored block if pending_buf will be full: */\r
+        max_start = s->block_start + max_block_size;\r
+        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {\r
+            /* strstart == 0 is possible when wraparound on 16-bit machine */\r
+            s->lookahead = (uInt)(s->strstart - max_start);\r
+            s->strstart = (uInt)max_start;\r
+            FLUSH_BLOCK(s, 0);\r
+        }\r
+        /* Flush if we may have to slide, otherwise block_start may become\r
+         * negative and the data will be gone:\r
+         */\r
+        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {\r
+            FLUSH_BLOCK(s, 0);\r
+        }\r
+    }\r
+    FLUSH_BLOCK(s, flush == Z_FINISH);\r
+    return flush == Z_FINISH ? finish_done : block_done;\r
+}\r
+\r
+/* ===========================================================================\r
+ * Compress as much as possible from the input stream, return the current\r
+ * block state.\r
+ * This function does not perform lazy evaluation of matches and inserts\r
+ * new strings in the dictionary only for unmatched strings or for short\r
+ * matches. It is used only for the fast compression options.\r
+ */\r
+local block_state deflate_fast(s, flush)\r
+    deflate_state *s;\r
+    int flush;\r
+{\r
+    IPos hash_head;       /* head of the hash chain */\r
+    int bflush;           /* set if current block must be flushed */\r
+\r
+    for (;;) {\r
+        /* Make sure that we always have enough lookahead, except\r
+         * at the end of the input file. We need MAX_MATCH bytes\r
+         * for the next match, plus MIN_MATCH bytes to insert the\r
+         * string following the next match.\r
+         */\r
+        if (s->lookahead < MIN_LOOKAHEAD) {\r
+            fill_window(s);\r
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {\r
+                return need_more;\r
+            }\r
+            if (s->lookahead == 0) break; /* flush the current block */\r
+        }\r
+\r
+        /* Insert the string window[strstart .. strstart+2] in the\r
+         * dictionary, and set hash_head to the head of the hash chain:\r
+         */\r
+        hash_head = NIL;\r
+        if (s->lookahead >= MIN_MATCH) {\r
+            INSERT_STRING(s, s->strstart, hash_head);\r
+        }\r
+\r
+        /* Find the longest match, discarding those <= prev_length.\r
+         * At this point we have always match_length < MIN_MATCH\r
+         */\r
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {\r
+            /* To simplify the code, we prevent matches with the string\r
+             * of window index 0 (in particular we have to avoid a match\r
+             * of the string with itself at the start of the input file).\r
+             */\r
+            s->match_length = longest_match (s, hash_head);\r
+            /* longest_match() sets match_start */\r
+        }\r
+        if (s->match_length >= MIN_MATCH) {\r
+            check_match(s, s->strstart, s->match_start, s->match_length);\r
+\r
+            _tr_tally_dist(s, s->strstart - s->match_start,\r
+                           s->match_length - MIN_MATCH, bflush);\r
+\r
+            s->lookahead -= s->match_length;\r
+\r
+            /* Insert new strings in the hash table only if the match length\r
+             * is not too large. This saves time but degrades compression.\r
+             */\r
+#ifndef FASTEST\r
+            if (s->match_length <= s->max_insert_length &&\r
+                s->lookahead >= MIN_MATCH) {\r
+                s->match_length--; /* string at strstart already in table */\r
+                do {\r
+                    s->strstart++;\r
+                    INSERT_STRING(s, s->strstart, hash_head);\r
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are\r
+                     * always MIN_MATCH bytes ahead.\r
+                     */\r
+                } while (--s->match_length != 0);\r
+                s->strstart++;\r
+            } else\r
+#endif\r
+            {\r
+                s->strstart += s->match_length;\r
+                s->match_length = 0;\r
+                s->ins_h = s->window[s->strstart];\r
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);\r
+#if MIN_MATCH != 3\r
+                Call UPDATE_HASH() MIN_MATCH-3 more times\r
+#endif\r
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not\r
+                 * matter since it will be recomputed at next deflate call.\r
+                 */\r
+            }\r
+        } else {\r
+            /* No match, output a literal byte */\r
+            Tracevv((stderr,"%c", s->window[s->strstart]));\r
+            _tr_tally_lit (s, s->window[s->strstart], bflush);\r
+            s->lookahead--;\r
+            s->strstart++;\r
+        }\r
+        if (bflush) FLUSH_BLOCK(s, 0);\r
+    }\r
+    FLUSH_BLOCK(s, flush == Z_FINISH);\r
+    return flush == Z_FINISH ? finish_done : block_done;\r
+}\r
+\r
+#ifndef FASTEST\r
+/* ===========================================================================\r
+ * Same as above, but achieves better compression. We use a lazy\r
+ * evaluation for matches: a match is finally adopted only if there is\r
+ * no better match at the next window position.\r
+ */\r
+local block_state deflate_slow(s, flush)\r
+    deflate_state *s;\r
+    int flush;\r
+{\r
+    IPos hash_head;          /* head of hash chain */\r
+    int bflush;              /* set if current block must be flushed */\r
+\r
+    /* Process the input block. */\r
+    for (;;) {\r
+        /* Make sure that we always have enough lookahead, except\r
+         * at the end of the input file. We need MAX_MATCH bytes\r
+         * for the next match, plus MIN_MATCH bytes to insert the\r
+         * string following the next match.\r
+         */\r
+        if (s->lookahead < MIN_LOOKAHEAD) {\r
+            fill_window(s);\r
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {\r
+                return need_more;\r
+            }\r
+            if (s->lookahead == 0) break; /* flush the current block */\r
+        }\r
+\r
+        /* Insert the string window[strstart .. strstart+2] in the\r
+         * dictionary, and set hash_head to the head of the hash chain:\r
+         */\r
+        hash_head = NIL;\r
+        if (s->lookahead >= MIN_MATCH) {\r
+            INSERT_STRING(s, s->strstart, hash_head);\r
+        }\r
+\r
+        /* Find the longest match, discarding those <= prev_length.\r
+         */\r
+        s->prev_length = s->match_length, s->prev_match = s->match_start;\r
+        s->match_length = MIN_MATCH-1;\r
+\r
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&\r
+            s->strstart - hash_head <= MAX_DIST(s)) {\r
+            /* To simplify the code, we prevent matches with the string\r
+             * of window index 0 (in particular we have to avoid a match\r
+             * of the string with itself at the start of the input file).\r
+             */\r
+            s->match_length = longest_match (s, hash_head);\r
+            /* longest_match() sets match_start */\r
+\r
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED\r
+#if TOO_FAR <= 32767\r
+                || (s->match_length == MIN_MATCH &&\r
+                    s->strstart - s->match_start > TOO_FAR)\r
+#endif\r
+                )) {\r
+\r
+                /* If prev_match is also MIN_MATCH, match_start is garbage\r
+                 * but we will ignore the current match anyway.\r
+                 */\r
+                s->match_length = MIN_MATCH-1;\r
+            }\r
+        }\r
+        /* If there was a match at the previous step and the current\r
+         * match is not better, output the previous match:\r
+         */\r
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {\r
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;\r
+            /* Do not insert strings in hash table beyond this. */\r
+\r
+            check_match(s, s->strstart-1, s->prev_match, s->prev_length);\r
+\r
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,\r
+                           s->prev_length - MIN_MATCH, bflush);\r
+\r
+            /* Insert in hash table all strings up to the end of the match.\r
+             * strstart-1 and strstart are already inserted. If there is not\r
+             * enough lookahead, the last two strings are not inserted in\r
+             * the hash table.\r
+             */\r
+            s->lookahead -= s->prev_length-1;\r
+            s->prev_length -= 2;\r
+            do {\r
+                if (++s->strstart <= max_insert) {\r
+                    INSERT_STRING(s, s->strstart, hash_head);\r
+                }\r
+            } while (--s->prev_length != 0);\r
+            s->match_available = 0;\r
+            s->match_length = MIN_MATCH-1;\r
+            s->strstart++;\r
+\r
+            if (bflush) FLUSH_BLOCK(s, 0);\r
+\r
+        } else if (s->match_available) {\r
+            /* If there was no match at the previous position, output a\r
+             * single literal. If there was a match but the current match\r
+             * is longer, truncate the previous match to a single literal.\r
+             */\r
+            Tracevv((stderr,"%c", s->window[s->strstart-1]));\r
+            _tr_tally_lit(s, s->window[s->strstart-1], bflush);\r
+            if (bflush) {\r
+                FLUSH_BLOCK_ONLY(s, 0);\r
+            }\r
+            s->strstart++;\r
+            s->lookahead--;\r
+            if (s->strm->avail_out == 0) return need_more;\r
+        } else {\r
+            /* There is no previous match to compare with, wait for\r
+             * the next step to decide.\r
+             */\r
+            s->match_available = 1;\r
+            s->strstart++;\r
+            s->lookahead--;\r
+        }\r
+    }\r
+    Assert (flush != Z_NO_FLUSH, "no flush?");\r
+    if (s->match_available) {\r
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));\r
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);\r
+        s->match_available = 0;\r
+    }\r
+    FLUSH_BLOCK(s, flush == Z_FINISH);\r
+    return flush == Z_FINISH ? finish_done : block_done;\r
+}\r
+#endif /* FASTEST */\r
+\r
+/* ===========================================================================\r
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance\r
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of\r
+ * deflate switches away from Z_RLE.)\r
+ */\r
+local block_state deflate_rle(s, flush)\r
+    deflate_state *s;\r
+    int flush;\r
+{\r
+    int bflush;             /* set if current block must be flushed */\r
+    uInt prev;              /* byte at distance one to match */\r
+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */\r
+\r
+    for (;;) {\r
+        /* Make sure that we always have enough lookahead, except\r
+         * at the end of the input file. We need MAX_MATCH bytes\r
+         * for the longest encodable run.\r
+         */\r
+        if (s->lookahead < MAX_MATCH) {\r
+            fill_window(s);\r
+            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {\r
+                return need_more;\r
+            }\r
+            if (s->lookahead == 0) break; /* flush the current block */\r
+        }\r
+\r
+        /* See how many times the previous byte repeats */\r
+        s->match_length = 0;\r
+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {\r
+            scan = s->window + s->strstart - 1;\r
+            prev = *scan;\r
+            if (prev == *++scan && prev == *++scan && prev == *++scan) {\r
+                strend = s->window + s->strstart + MAX_MATCH;\r
+                do {\r
+                } while (prev == *++scan && prev == *++scan &&\r
+                         prev == *++scan && prev == *++scan &&\r
+                         prev == *++scan && prev == *++scan &&\r
+                         prev == *++scan && prev == *++scan &&\r
+                         scan < strend);\r
+                s->match_length = MAX_MATCH - (int)(strend - scan);\r
+                if (s->match_length > s->lookahead)\r
+                    s->match_length = s->lookahead;\r
+            }\r
+        }\r
+\r
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */\r
+        if (s->match_length >= MIN_MATCH) {\r
+            check_match(s, s->strstart, s->strstart - 1, s->match_length);\r
+\r
+            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);\r
+\r
+            s->lookahead -= s->match_length;\r
+            s->strstart += s->match_length;\r
+            s->match_length = 0;\r
+        } else {\r
+            /* No match, output a literal byte */\r
+            Tracevv((stderr,"%c", s->window[s->strstart]));\r
+            _tr_tally_lit (s, s->window[s->strstart], bflush);\r
+            s->lookahead--;\r
+            s->strstart++;\r
+        }\r
+        if (bflush) FLUSH_BLOCK(s, 0);\r
+    }\r
+    FLUSH_BLOCK(s, flush == Z_FINISH);\r
+    return flush == Z_FINISH ? finish_done : block_done;\r
+}\r
+\r
+/* ===========================================================================\r
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.\r
+ * (It will be regenerated if this run of deflate switches away from Huffman.)\r
+ */\r
+local block_state deflate_huff(s, flush)\r
+    deflate_state *s;\r
+    int flush;\r
+{\r
+    int bflush;             /* set if current block must be flushed */\r
+\r
+    for (;;) {\r
+        /* Make sure that we have a literal to write. */\r
+        if (s->lookahead == 0) {\r
+            fill_window(s);\r
+            if (s->lookahead == 0) {\r
+                if (flush == Z_NO_FLUSH)\r
+                    return need_more;\r
+                break;      /* flush the current block */\r
+            }\r
+        }\r
+\r
+        /* Output a literal byte */\r
+        s->match_length = 0;\r
+        Tracevv((stderr,"%c", s->window[s->strstart]));\r
+        _tr_tally_lit (s, s->window[s->strstart], bflush);\r
+        s->lookahead--;\r
+        s->strstart++;\r
+        if (bflush) FLUSH_BLOCK(s, 0);\r
+    }\r
+    FLUSH_BLOCK(s, flush == Z_FINISH);\r
+    return flush == Z_FINISH ? finish_done : block_done;\r
+}\r
diff --git a/win32port/zlib/deflate.h b/win32port/zlib/deflate.h
new file mode 100644 (file)
index 0000000..e9044c1
--- /dev/null
@@ -0,0 +1,342 @@
+/* deflate.h -- internal compression state\r
+ * Copyright (C) 1995-2010 Jean-loup Gailly\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* WARNING: this file should *not* be used by applications. It is\r
+   part of the implementation of the compression library and is\r
+   subject to change. Applications should only use zlib.h.\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#ifndef DEFLATE_H\r
+#define DEFLATE_H\r
+\r
+#include "zutil.h"\r
+\r
+/* define NO_GZIP when compiling if you want to disable gzip header and\r
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in\r
+   the crc code when it is not needed.  For shared libraries, gzip encoding\r
+   should be left enabled. */\r
+#ifndef NO_GZIP\r
+#  define GZIP\r
+#endif\r
+\r
+/* ===========================================================================\r
+ * Internal compression state.\r
+ */\r
+\r
+#define LENGTH_CODES 29\r
+/* number of length codes, not counting the special END_BLOCK code */\r
+\r
+#define LITERALS  256\r
+/* number of literal bytes 0..255 */\r
+\r
+#define L_CODES (LITERALS+1+LENGTH_CODES)\r
+/* number of Literal or Length codes, including the END_BLOCK code */\r
+\r
+#define D_CODES   30\r
+/* number of distance codes */\r
+\r
+#define BL_CODES  19\r
+/* number of codes used to transfer the bit lengths */\r
+\r
+#define HEAP_SIZE (2*L_CODES+1)\r
+/* maximum heap size */\r
+\r
+#define MAX_BITS 15\r
+/* All codes must not exceed MAX_BITS bits */\r
+\r
+#define INIT_STATE    42\r
+#define EXTRA_STATE   69\r
+#define NAME_STATE    73\r
+#define COMMENT_STATE 91\r
+#define HCRC_STATE   103\r
+#define BUSY_STATE   113\r
+#define FINISH_STATE 666\r
+/* Stream status */\r
+\r
+\r
+/* Data structure describing a single value and its code string. */\r
+typedef struct ct_data_s {\r
+    union {\r
+        ush  freq;       /* frequency count */\r
+        ush  code;       /* bit string */\r
+    } fc;\r
+    union {\r
+        ush  dad;        /* father node in Huffman tree */\r
+        ush  len;        /* length of bit string */\r
+    } dl;\r
+} FAR ct_data;\r
+\r
+#define Freq fc.freq\r
+#define Code fc.code\r
+#define Dad  dl.dad\r
+#define Len  dl.len\r
+\r
+typedef struct static_tree_desc_s  static_tree_desc;\r
+\r
+typedef struct tree_desc_s {\r
+    ct_data *dyn_tree;           /* the dynamic tree */\r
+    int     max_code;            /* largest code with non zero frequency */\r
+    static_tree_desc *stat_desc; /* the corresponding static tree */\r
+} FAR tree_desc;\r
+\r
+typedef ush Pos;\r
+typedef Pos FAR Posf;\r
+typedef unsigned IPos;\r
+\r
+/* A Pos is an index in the character window. We use short instead of int to\r
+ * save space in the various tables. IPos is used only for parameter passing.\r
+ */\r
+\r
+typedef struct internal_state {\r
+    z_streamp strm;      /* pointer back to this zlib stream */\r
+    int   status;        /* as the name implies */\r
+    Bytef *pending_buf;  /* output still pending */\r
+    ulg   pending_buf_size; /* size of pending_buf */\r
+    Bytef *pending_out;  /* next pending byte to output to the stream */\r
+    uInt   pending;      /* nb of bytes in the pending buffer */\r
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */\r
+    gz_headerp  gzhead;  /* gzip header information to write */\r
+    uInt   gzindex;      /* where in extra, name, or comment */\r
+    Byte  method;        /* STORED (for zip only) or DEFLATED */\r
+    int   last_flush;    /* value of flush param for previous deflate call */\r
+\r
+                /* used by deflate.c: */\r
+\r
+    uInt  w_size;        /* LZ77 window size (32K by default) */\r
+    uInt  w_bits;        /* log2(w_size)  (8..16) */\r
+    uInt  w_mask;        /* w_size - 1 */\r
+\r
+    Bytef *window;\r
+    /* Sliding window. Input bytes are read into the second half of the window,\r
+     * and move to the first half later to keep a dictionary of at least wSize\r
+     * bytes. With this organization, matches are limited to a distance of\r
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always\r
+     * performed with a length multiple of the block size. Also, it limits\r
+     * the window size to 64K, which is quite useful on MSDOS.\r
+     * To do: use the user input buffer as sliding window.\r
+     */\r
+\r
+    ulg window_size;\r
+    /* Actual size of window: 2*wSize, except when the user input buffer\r
+     * is directly used as sliding window.\r
+     */\r
+\r
+    Posf *prev;\r
+    /* Link to older string with same hash index. To limit the size of this\r
+     * array to 64K, this link is maintained only for the last 32K strings.\r
+     * An index in this array is thus a window index modulo 32K.\r
+     */\r
+\r
+    Posf *head; /* Heads of the hash chains or NIL. */\r
+\r
+    uInt  ins_h;          /* hash index of string to be inserted */\r
+    uInt  hash_size;      /* number of elements in hash table */\r
+    uInt  hash_bits;      /* log2(hash_size) */\r
+    uInt  hash_mask;      /* hash_size-1 */\r
+\r
+    uInt  hash_shift;\r
+    /* Number of bits by which ins_h must be shifted at each input\r
+     * step. It must be such that after MIN_MATCH steps, the oldest\r
+     * byte no longer takes part in the hash key, that is:\r
+     *   hash_shift * MIN_MATCH >= hash_bits\r
+     */\r
+\r
+    long block_start;\r
+    /* Window position at the beginning of the current output block. Gets\r
+     * negative when the window is moved backwards.\r
+     */\r
+\r
+    uInt match_length;           /* length of best match */\r
+    IPos prev_match;             /* previous match */\r
+    int match_available;         /* set if previous match exists */\r
+    uInt strstart;               /* start of string to insert */\r
+    uInt match_start;            /* start of matching string */\r
+    uInt lookahead;              /* number of valid bytes ahead in window */\r
+\r
+    uInt prev_length;\r
+    /* Length of the best match at previous step. Matches not greater than this\r
+     * are discarded. This is used in the lazy match evaluation.\r
+     */\r
+\r
+    uInt max_chain_length;\r
+    /* To speed up deflation, hash chains are never searched beyond this\r
+     * length.  A higher limit improves compression ratio but degrades the\r
+     * speed.\r
+     */\r
+\r
+    uInt max_lazy_match;\r
+    /* Attempt to find a better match only when the current match is strictly\r
+     * smaller than this value. This mechanism is used only for compression\r
+     * levels >= 4.\r
+     */\r
+#   define max_insert_length  max_lazy_match\r
+    /* Insert new strings in the hash table only if the match length is not\r
+     * greater than this length. This saves time but degrades compression.\r
+     * max_insert_length is used only for compression levels <= 3.\r
+     */\r
+\r
+    int level;    /* compression level (1..9) */\r
+    int strategy; /* favor or force Huffman coding*/\r
+\r
+    uInt good_match;\r
+    /* Use a faster search when the previous match is longer than this */\r
+\r
+    int nice_match; /* Stop searching when current match exceeds this */\r
+\r
+                /* used by trees.c: */\r
+    /* Didn't use ct_data typedef below to supress compiler warning */\r
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */\r
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */\r
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */\r
+\r
+    struct tree_desc_s l_desc;               /* desc. for literal tree */\r
+    struct tree_desc_s d_desc;               /* desc. for distance tree */\r
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */\r
+\r
+    ush bl_count[MAX_BITS+1];\r
+    /* number of codes at each bit length for an optimal tree */\r
+\r
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */\r
+    int heap_len;               /* number of elements in the heap */\r
+    int heap_max;               /* element of largest frequency */\r
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.\r
+     * The same heap array is used to build all trees.\r
+     */\r
+\r
+    uch depth[2*L_CODES+1];\r
+    /* Depth of each subtree used as tie breaker for trees of equal frequency\r
+     */\r
+\r
+    uchf *l_buf;          /* buffer for literals or lengths */\r
+\r
+    uInt  lit_bufsize;\r
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for\r
+     * limiting lit_bufsize to 64K:\r
+     *   - frequencies can be kept in 16 bit counters\r
+     *   - if compression is not successful for the first block, all input\r
+     *     data is still in the window so we can still emit a stored block even\r
+     *     when input comes from standard input.  (This can also be done for\r
+     *     all blocks if lit_bufsize is not greater than 32K.)\r
+     *   - if compression is not successful for a file smaller than 64K, we can\r
+     *     even emit a stored file instead of a stored block (saving 5 bytes).\r
+     *     This is applicable only for zip (not gzip or zlib).\r
+     *   - creating new Huffman trees less frequently may not provide fast\r
+     *     adaptation to changes in the input data statistics. (Take for\r
+     *     example a binary file with poorly compressible code followed by\r
+     *     a highly compressible string table.) Smaller buffer sizes give\r
+     *     fast adaptation but have of course the overhead of transmitting\r
+     *     trees more frequently.\r
+     *   - I can't count above 4\r
+     */\r
+\r
+    uInt last_lit;      /* running index in l_buf */\r
+\r
+    ushf *d_buf;\r
+    /* Buffer for distances. To simplify the code, d_buf and l_buf have\r
+     * the same number of elements. To use different lengths, an extra flag\r
+     * array would be necessary.\r
+     */\r
+\r
+    ulg opt_len;        /* bit length of current block with optimal trees */\r
+    ulg static_len;     /* bit length of current block with static trees */\r
+    uInt matches;       /* number of string matches in current block */\r
+    int last_eob_len;   /* bit length of EOB code for last block */\r
+\r
+#ifdef DEBUG\r
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */\r
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */\r
+#endif\r
+\r
+    ush bi_buf;\r
+    /* Output buffer. bits are inserted starting at the bottom (least\r
+     * significant bits).\r
+     */\r
+    int bi_valid;\r
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit\r
+     * are always zero.\r
+     */\r
+\r
+    ulg high_water;\r
+    /* High water mark offset in window for initialized bytes -- bytes above\r
+     * this are set to zero in order to avoid memory check warnings when\r
+     * longest match routines access bytes past the input.  This is then\r
+     * updated to the new high water mark.\r
+     */\r
+\r
+} FAR deflate_state;\r
+\r
+/* Output a byte on the stream.\r
+ * IN assertion: there is enough room in pending_buf.\r
+ */\r
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}\r
+\r
+\r
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)\r
+/* Minimum amount of lookahead, except at the end of the input file.\r
+ * See deflate.c for comments about the MIN_MATCH+1.\r
+ */\r
+\r
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)\r
+/* In order to simplify the code, particularly on 16 bit machines, match\r
+ * distances are limited to MAX_DIST instead of WSIZE.\r
+ */\r
+\r
+#define WIN_INIT MAX_MATCH\r
+/* Number of bytes after end of data in window to initialize in order to avoid\r
+   memory checker errors from longest match routines */\r
+\r
+        /* in trees.c */\r
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));\r
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));\r
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,\r
+                        ulg stored_len, int last));\r
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));\r
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,\r
+                        ulg stored_len, int last));\r
+\r
+#define d_code(dist) \\r
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])\r
+/* Mapping from a distance to a distance code. dist is the distance - 1 and\r
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never\r
+ * used.\r
+ */\r
+\r
+#ifndef DEBUG\r
+/* Inline versions of _tr_tally for speed: */\r
+\r
+#if defined(GEN_TREES_H) || !defined(STDC)\r
+  extern uch ZLIB_INTERNAL _length_code[];\r
+  extern uch ZLIB_INTERNAL _dist_code[];\r
+#else\r
+  extern const uch ZLIB_INTERNAL _length_code[];\r
+  extern const uch ZLIB_INTERNAL _dist_code[];\r
+#endif\r
+\r
+# define _tr_tally_lit(s, c, flush) \\r
+  { uch cc = (c); \\r
+    s->d_buf[s->last_lit] = 0; \\r
+    s->l_buf[s->last_lit++] = cc; \\r
+    s->dyn_ltree[cc].Freq++; \\r
+    flush = (s->last_lit == s->lit_bufsize-1); \\r
+   }\r
+# define _tr_tally_dist(s, distance, length, flush) \\r
+  { uch len = (length); \\r
+    ush dist = (distance); \\r
+    s->d_buf[s->last_lit] = dist; \\r
+    s->l_buf[s->last_lit++] = len; \\r
+    dist--; \\r
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \\r
+    s->dyn_dtree[d_code(dist)].Freq++; \\r
+    flush = (s->last_lit == s->lit_bufsize-1); \\r
+  }\r
+#else\r
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)\r
+# define _tr_tally_dist(s, distance, length, flush) \\r
+              flush = _tr_tally(s, distance, length)\r
+#endif\r
+\r
+#endif /* DEFLATE_H */\r
diff --git a/win32port/zlib/gzclose.c b/win32port/zlib/gzclose.c
new file mode 100755 (executable)
index 0000000..cbf0db6
--- /dev/null
@@ -0,0 +1,25 @@
+/* gzclose.c -- zlib gzclose() function\r
+ * Copyright (C) 2004, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+#include "gzguts.h"\r
+\r
+/* gzclose() is in a separate file so that it is linked in only if it is used.\r
+   That way the other gzclose functions can be used instead to avoid linking in\r
+   unneeded compression or decompression routines. */\r
+int ZEXPORT gzclose(file)\r
+    gzFile file;\r
+{\r
+#ifndef NO_GZCOMPRESS\r
+    gz_statep state;\r
+\r
+    if (file == NULL)\r
+        return Z_STREAM_ERROR;\r
+    state = (gz_statep)file;\r
+\r
+    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);\r
+#else\r
+    return gzclose_r(file);\r
+#endif\r
+}\r
diff --git a/win32port/zlib/gzguts.h b/win32port/zlib/gzguts.h
new file mode 100755 (executable)
index 0000000..7ff93a8
--- /dev/null
@@ -0,0 +1,132 @@
+/* gzguts.h -- zlib internal header definitions for gz* operations\r
+ * Copyright (C) 2004, 2005, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+#ifdef _LARGEFILE64_SOURCE\r
+#  ifndef _LARGEFILE_SOURCE\r
+#    define _LARGEFILE_SOURCE 1\r
+#  endif\r
+#  ifdef _FILE_OFFSET_BITS\r
+#    undef _FILE_OFFSET_BITS\r
+#  endif\r
+#endif\r
+\r
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)\r
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))\r
+#else\r
+#  define ZLIB_INTERNAL\r
+#endif\r
+\r
+#include <stdio.h>\r
+#include "zlib.h"\r
+#ifdef STDC\r
+#  include <string.h>\r
+#  include <stdlib.h>\r
+#  include <limits.h>\r
+#endif\r
+#include <fcntl.h>\r
+\r
+#ifdef NO_DEFLATE       /* for compatibility with old definition */\r
+#  define NO_GZCOMPRESS\r
+#endif\r
+\r
+#ifdef _MSC_VER\r
+#  include <io.h>\r
+#  define vsnprintf _vsnprintf\r
+#endif\r
+\r
+#ifndef local\r
+#  define local static\r
+#endif\r
+/* compile with -Dlocal if your debugger can't find static symbols */\r
+\r
+/* gz* functions always use library allocation functions */\r
+#ifndef STDC\r
+  extern voidp  malloc OF((uInt size));\r
+  extern void   free   OF((voidpf ptr));\r
+#endif\r
+\r
+/* get errno and strerror definition */\r
+#if defined UNDER_CE\r
+#  include <windows.h>\r
+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())\r
+#else\r
+#  ifdef STDC\r
+#    include <errno.h>\r
+#    define zstrerror() strerror(errno)\r
+#  else\r
+#    define zstrerror() "stdio error (consult errno)"\r
+#  endif\r
+#endif\r
+\r
+/* provide prototypes for these when building zlib without LFS */\r
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0\r
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));\r
+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));\r
+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));\r
+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));\r
+#endif\r
+\r
+/* default i/o buffer size -- double this for output when reading */\r
+#define GZBUFSIZE 8192\r
+\r
+/* gzip modes, also provide a little integrity check on the passed structure */\r
+#define GZ_NONE 0\r
+#define GZ_READ 7247\r
+#define GZ_WRITE 31153\r
+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */\r
+\r
+/* values for gz_state how */\r
+#define LOOK 0      /* look for a gzip header */\r
+#define COPY 1      /* copy input directly */\r
+#define GZIP 2      /* decompress a gzip stream */\r
+\r
+/* internal gzip file state data structure */\r
+typedef struct {\r
+        /* used for both reading and writing */\r
+    int mode;               /* see gzip modes above */\r
+    int fd;                 /* file descriptor */\r
+    char *path;             /* path or fd for error messages */\r
+    z_off64_t pos;          /* current position in uncompressed data */\r
+    unsigned size;          /* buffer size, zero if not allocated yet */\r
+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */\r
+    unsigned char *in;      /* input buffer */\r
+    unsigned char *out;     /* output buffer (double-sized when reading) */\r
+    unsigned char *next;    /* next output data to deliver or write */\r
+        /* just for reading */\r
+    unsigned have;          /* amount of output data unused at next */\r
+    int eof;                /* true if end of input file reached */\r
+    z_off64_t start;        /* where the gzip data started, for rewinding */\r
+    z_off64_t raw;          /* where the raw data started, for seeking */\r
+    int how;                /* 0: get header, 1: copy, 2: decompress */\r
+    int direct;             /* true if last read direct, false if gzip */\r
+        /* just for writing */\r
+    int level;              /* compression level */\r
+    int strategy;           /* compression strategy */\r
+        /* seek request */\r
+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */\r
+    int seek;               /* true if seek request pending */\r
+        /* error information */\r
+    int err;                /* error code */\r
+    char *msg;              /* error message */\r
+        /* zlib inflate or deflate stream */\r
+    z_stream strm;          /* stream structure in-place (not a pointer) */\r
+} gz_state;\r
+typedef gz_state FAR *gz_statep;\r
+\r
+/* shared functions */\r
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));\r
+#if defined UNDER_CE\r
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));\r
+#endif\r
+\r
+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t\r
+   value -- needed when comparing unsigned to z_off64_t, which is signed\r
+   (possible z_off64_t types off_t, off64_t, and long are all signed) */\r
+#ifdef INT_MAX\r
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)\r
+#else\r
+unsigned ZLIB_INTERNAL gz_intmax OF((void));\r
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())\r
+#endif\r
diff --git a/win32port/zlib/gzio.c b/win32port/zlib/gzio.c
new file mode 100644 (file)
index 0000000..26f2da1
--- /dev/null
@@ -0,0 +1,1005 @@
+/* gzio.c -- IO on .gz files\r
+ * Copyright (C) 1995-2003 Jean-loup Gailly.\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ *\r
+ * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#include <stdio.h>\r
+\r
+#include "zutil.h"\r
+\r
+#ifdef NO_DEFLATE       /* for compatiblity with old definition */\r
+#  define NO_GZCOMPRESS\r
+#endif\r
+\r
+#ifndef NO_DUMMY_DECL\r
+struct internal_state {int dummy;}; /* for buggy compilers */\r
+#endif\r
+\r
+#ifndef Z_BUFSIZE\r
+#  ifdef MAXSEG_64K\r
+#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */\r
+#  else\r
+#    define Z_BUFSIZE 16384\r
+#  endif\r
+#endif\r
+#ifndef Z_PRINTF_BUFSIZE\r
+#  define Z_PRINTF_BUFSIZE 4096\r
+#endif\r
+\r
+#ifdef __MVS__\r
+#  pragma map (fdopen , "\174\174FDOPEN")\r
+   FILE *fdopen(int, const char *);\r
+#endif\r
+\r
+#ifndef STDC\r
+extern voidp  malloc OF((uInt size));\r
+extern void   free   OF((voidpf ptr));\r
+#endif\r
+\r
+#define ALLOC(size) malloc(size)\r
+#define TRYFREE(p) {if (p) free(p);}\r
+\r
+static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */\r
+\r
+/* gzip flag byte */\r
+#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */\r
+#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */\r
+#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */\r
+#define ORIG_NAME    0x08 /* bit 3 set: original file name present */\r
+#define COMMENT      0x10 /* bit 4 set: file comment present */\r
+#define RESERVED     0xE0 /* bits 5..7: reserved */\r
+\r
+typedef struct gz_stream {\r
+    z_stream stream;\r
+    int      z_err;   /* error code for last stream operation */\r
+    int      z_eof;   /* set if end of input file */\r
+    FILE     *file;   /* .gz file */\r
+    Byte     *inbuf;  /* input buffer */\r
+    Byte     *outbuf; /* output buffer */\r
+    uLong    crc;     /* crc32 of uncompressed data */\r
+    char     *msg;    /* error message */\r
+    char     *path;   /* path name for debugging only */\r
+    int      transparent; /* 1 if input file is not a .gz file */\r
+    char     mode;    /* 'w' or 'r' */\r
+    z_off_t  start;   /* start of compressed data in file (header skipped) */\r
+    z_off_t  in;      /* bytes into deflate or inflate */\r
+    z_off_t  out;     /* bytes out of deflate or inflate */\r
+    int      back;    /* one character push-back */\r
+    int      last;    /* true if push-back is last character */\r
+} gz_stream;\r
+\r
+\r
+local gzFile gz_open      OF((const char *path, const char *mode, int  fd));\r
+local int do_flush        OF((gzFile file, int flush));\r
+local int    get_byte     OF((gz_stream *s));\r
+local void   check_header OF((gz_stream *s));\r
+local int    destroy      OF((gz_stream *s));\r
+local void   putLong      OF((FILE *file, uLong x));\r
+local uLong  getLong      OF((gz_stream *s));\r
+\r
+/* ===========================================================================\r
+     Opens a gzip (.gz) file for reading or writing. The mode parameter\r
+   is as in fopen ("rb" or "wb"). The file is given either by file descriptor\r
+   or path name (if fd == -1).\r
+     gz_open returns NULL if the file could not be opened or if there was\r
+   insufficient memory to allocate the (de)compression state; errno\r
+   can be checked to distinguish the two cases (if errno is zero, the\r
+   zlib error is Z_MEM_ERROR).\r
+*/\r
+local gzFile gz_open (path, mode, fd)\r
+    const char *path;\r
+    const char *mode;\r
+    int  fd;\r
+{\r
+    int err;\r
+    int level = Z_DEFAULT_COMPRESSION; /* compression level */\r
+    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */\r
+    char *p = (char*)mode;\r
+    gz_stream *s;\r
+    char fmode[80]; /* copy of mode, without the compression level */\r
+    char *m = fmode;\r
+\r
+    if (!path || !mode) return Z_NULL;\r
+\r
+    s = (gz_stream *)ALLOC(sizeof(gz_stream));\r
+    if (!s) return Z_NULL;\r
+\r
+    s->stream.zalloc = (alloc_func)0;\r
+    s->stream.zfree = (free_func)0;\r
+    s->stream.opaque = (voidpf)0;\r
+    s->stream.next_in = s->inbuf = Z_NULL;\r
+    s->stream.next_out = s->outbuf = Z_NULL;\r
+    s->stream.avail_in = s->stream.avail_out = 0;\r
+    s->file = NULL;\r
+    s->z_err = Z_OK;\r
+    s->z_eof = 0;\r
+    s->in = 0;\r
+    s->out = 0;\r
+    s->back = EOF;\r
+    s->crc = crc32(0L, Z_NULL, 0);\r
+    s->msg = NULL;\r
+    s->transparent = 0;\r
+\r
+    s->path = (char*)ALLOC(strlen(path)+1);\r
+    if (s->path == NULL) {\r
+        return destroy(s), (gzFile)Z_NULL;\r
+    }\r
+    strcpy(s->path, path); /* do this early for debugging */\r
+\r
+    s->mode = '\0';\r
+    do {\r
+        if (*p == 'r') s->mode = 'r';\r
+        if (*p == 'w' || *p == 'a') s->mode = 'w';\r
+        if (*p >= '0' && *p <= '9') {\r
+            level = *p - '0';\r
+        } else if (*p == 'f') {\r
+          strategy = Z_FILTERED;\r
+        } else if (*p == 'h') {\r
+          strategy = Z_HUFFMAN_ONLY;\r
+        } else if (*p == 'R') {\r
+          strategy = Z_RLE;\r
+        } else {\r
+            *m++ = *p; /* copy the mode */\r
+        }\r
+    } while (*p++ && m != fmode + sizeof(fmode));\r
+    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;\r
+\r
+    if (s->mode == 'w') {\r
+#ifdef NO_GZCOMPRESS\r
+        err = Z_STREAM_ERROR;\r
+#else\r
+        err = deflateInit2(&(s->stream), level,\r
+                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);\r
+        /* windowBits is passed < 0 to suppress zlib header */\r
+\r
+        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);\r
+#endif\r
+        if (err != Z_OK || s->outbuf == Z_NULL) {\r
+            return destroy(s), (gzFile)Z_NULL;\r
+        }\r
+    } else {\r
+        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);\r
+\r
+        err = inflateInit2(&(s->stream), -MAX_WBITS);\r
+        /* windowBits is passed < 0 to tell that there is no zlib header.\r
+         * Note that in this case inflate *requires* an extra "dummy" byte\r
+         * after the compressed stream in order to complete decompression and\r
+         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are\r
+         * present after the compressed stream.\r
+         */\r
+        if (err != Z_OK || s->inbuf == Z_NULL) {\r
+            return destroy(s), (gzFile)Z_NULL;\r
+        }\r
+    }\r
+    s->stream.avail_out = Z_BUFSIZE;\r
+\r
+    errno = 0;\r
+    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);\r
+\r
+    if (s->file == NULL) {\r
+        return destroy(s), (gzFile)Z_NULL;\r
+    }\r
+    if (s->mode == 'w') {\r
+        /* Write a very simple .gz header:\r
+         */\r
+        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],\r
+             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);\r
+        s->start = 10L;\r
+        /* We use 10L instead of ftell(s->file) to because ftell causes an\r
+         * fflush on some systems. This version of the library doesn't use\r
+         * start anyway in write mode, so this initialization is not\r
+         * necessary.\r
+         */\r
+    } else {\r
+        check_header(s); /* skip the .gz header */\r
+        s->start = ftell(s->file) - s->stream.avail_in;\r
+    }\r
+\r
+    return (gzFile)s;\r
+}\r
+\r
+/* ===========================================================================\r
+     Opens a gzip (.gz) file for reading or writing.\r
+*/\r
+gzFile ZEXPORT gzopen (path, mode)\r
+    const char *path;\r
+    const char *mode;\r
+{\r
+    return gz_open (path, mode, -1);\r
+}\r
+\r
+/* ===========================================================================\r
+     Associate a gzFile with the file descriptor fd. fd is not dup'ed here\r
+   to mimic the behavio(u)r of fdopen.\r
+*/\r
+gzFile ZEXPORT gzdopen (fd, mode)\r
+    int fd;\r
+    const char *mode;\r
+{\r
+    char name[20];\r
+\r
+    if (fd < 0) return (gzFile)Z_NULL;\r
+    sprintf(name, "<fd:%d>", fd); /* for debugging */\r
+\r
+    return gz_open (name, mode, fd);\r
+}\r
+\r
+/* ===========================================================================\r
+ * Update the compression level and strategy\r
+ */\r
+int ZEXPORT gzsetparams (file, level, strategy)\r
+    gzFile file;\r
+    int level;\r
+    int strategy;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;\r
+\r
+    /* Make room to allow flushing */\r
+    if (s->stream.avail_out == 0) {\r
+\r
+        s->stream.next_out = s->outbuf;\r
+        if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {\r
+            s->z_err = Z_ERRNO;\r
+        }\r
+        s->stream.avail_out = Z_BUFSIZE;\r
+    }\r
+\r
+    return deflateParams (&(s->stream), level, strategy);\r
+}\r
+\r
+/* ===========================================================================\r
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF\r
+   for end of file.\r
+   IN assertion: the stream s has been sucessfully opened for reading.\r
+*/\r
+local int get_byte(s)\r
+    gz_stream *s;\r
+{\r
+    if (s->z_eof) return EOF;\r
+    if (s->stream.avail_in == 0) {\r
+        errno = 0;\r
+        s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);\r
+        if (s->stream.avail_in == 0) {\r
+            s->z_eof = 1;\r
+            if (ferror(s->file)) s->z_err = Z_ERRNO;\r
+            return EOF;\r
+        }\r
+        s->stream.next_in = s->inbuf;\r
+    }\r
+    s->stream.avail_in--;\r
+    return *(s->stream.next_in)++;\r
+}\r
+\r
+/* ===========================================================================\r
+      Check the gzip header of a gz_stream opened for reading. Set the stream\r
+    mode to transparent if the gzip magic header is not present; set s->err\r
+    to Z_DATA_ERROR if the magic header is present but the rest of the header\r
+    is incorrect.\r
+    IN assertion: the stream s has already been created sucessfully;\r
+       s->stream.avail_in is zero for the first time, but may be non-zero\r
+       for concatenated .gz files.\r
+*/\r
+local void check_header(s)\r
+    gz_stream *s;\r
+{\r
+    int method; /* method byte */\r
+    int flags;  /* flags byte */\r
+    uInt len;\r
+    int c;\r
+\r
+    /* Assure two bytes in the buffer so we can peek ahead -- handle case\r
+       where first byte of header is at the end of the buffer after the last\r
+       gzip segment */\r
+    len = s->stream.avail_in;\r
+    if (len < 2) {\r
+        if (len) s->inbuf[0] = s->stream.next_in[0];\r
+        errno = 0;\r
+        len = fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);\r
+        if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;\r
+        s->stream.avail_in += len;\r
+        s->stream.next_in = s->inbuf;\r
+        if (s->stream.avail_in < 2) {\r
+            s->transparent = s->stream.avail_in;\r
+            return;\r
+        }\r
+    }\r
+\r
+    /* Peek ahead to check the gzip magic header */\r
+    if (s->stream.next_in[0] != gz_magic[0] ||\r
+        s->stream.next_in[1] != gz_magic[1]) {\r
+        s->transparent = 1;\r
+        return;\r
+    }\r
+    s->stream.avail_in -= 2;\r
+    s->stream.next_in += 2;\r
+\r
+    /* Check the rest of the gzip header */\r
+    method = get_byte(s);\r
+    flags = get_byte(s);\r
+    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {\r
+        s->z_err = Z_DATA_ERROR;\r
+        return;\r
+    }\r
+\r
+    /* Discard time, xflags and OS code: */\r
+    for (len = 0; len < 6; len++) (void)get_byte(s);\r
+\r
+    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */\r
+        len  =  (uInt)get_byte(s);\r
+        len += ((uInt)get_byte(s))<<8;\r
+        /* len is garbage if EOF but the loop below will quit anyway */\r
+        while (len-- != 0 && get_byte(s) != EOF) ;\r
+    }\r
+    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */\r
+        while ((c = get_byte(s)) != 0 && c != EOF) ;\r
+    }\r
+    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */\r
+        while ((c = get_byte(s)) != 0 && c != EOF) ;\r
+    }\r
+    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */\r
+        for (len = 0; len < 2; len++) (void)get_byte(s);\r
+    }\r
+    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;\r
+}\r
+\r
+ /* ===========================================================================\r
+ * Cleanup then free the given gz_stream. Return a zlib error code.\r
+   Try freeing in the reverse order of allocations.\r
+ */\r
+local int destroy (s)\r
+    gz_stream *s;\r
+{\r
+    int err = Z_OK;\r
+\r
+    if (!s) return Z_STREAM_ERROR;\r
+\r
+    TRYFREE(s->msg);\r
+\r
+    if (s->stream.state != NULL) {\r
+        if (s->mode == 'w') {\r
+#ifdef NO_GZCOMPRESS\r
+            err = Z_STREAM_ERROR;\r
+#else\r
+            err = deflateEnd(&(s->stream));\r
+#endif\r
+        } else if (s->mode == 'r') {\r
+            err = inflateEnd(&(s->stream));\r
+        }\r
+    }\r
+    if (s->file != NULL && fclose(s->file)) {\r
+#ifdef ESPIPE\r
+        if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */\r
+#endif\r
+            err = Z_ERRNO;\r
+    }\r
+    if (s->z_err < 0) err = s->z_err;\r
+\r
+    TRYFREE(s->inbuf);\r
+    TRYFREE(s->outbuf);\r
+    TRYFREE(s->path);\r
+    TRYFREE(s);\r
+    return err;\r
+}\r
+\r
+/* ===========================================================================\r
+     Reads the given number of uncompressed bytes from the compressed file.\r
+   gzread returns the number of bytes actually read (0 for end of file).\r
+*/\r
+int ZEXPORT gzread (file, buf, len)\r
+    gzFile file;\r
+    voidp buf;\r
+    unsigned len;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+    Bytef *start = (Bytef*)buf; /* starting point for crc computation */\r
+    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */\r
+\r
+    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;\r
+\r
+    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;\r
+    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */\r
+\r
+    next_out = (Byte*)buf;\r
+    s->stream.next_out = (Bytef*)buf;\r
+    s->stream.avail_out = len;\r
+\r
+    if (s->stream.avail_out && s->back != EOF) {\r
+        *next_out++ = s->back;\r
+        s->stream.next_out++;\r
+        s->stream.avail_out--;\r
+        s->back = EOF;\r
+        s->out++;\r
+        if (s->last) {\r
+            s->z_err = Z_STREAM_END;\r
+            return 1;\r
+        }\r
+    }\r
+\r
+    while (s->stream.avail_out != 0) {\r
+\r
+        if (s->transparent) {\r
+            /* Copy first the lookahead bytes: */\r
+            uInt n = s->stream.avail_in;\r
+            if (n > s->stream.avail_out) n = s->stream.avail_out;\r
+            if (n > 0) {\r
+                zmemcpy(s->stream.next_out, s->stream.next_in, n);\r
+                next_out += n;\r
+                s->stream.next_out = next_out;\r
+                s->stream.next_in   += n;\r
+                s->stream.avail_out -= n;\r
+                s->stream.avail_in  -= n;\r
+            }\r
+            if (s->stream.avail_out > 0) {\r
+                s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,\r
+                                             s->file);\r
+            }\r
+            len -= s->stream.avail_out;\r
+            s->in  += len;\r
+            s->out += len;\r
+            if (len == 0) s->z_eof = 1;\r
+            return (int)len;\r
+        }\r
+        if (s->stream.avail_in == 0 && !s->z_eof) {\r
+\r
+            errno = 0;\r
+            s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);\r
+            if (s->stream.avail_in == 0) {\r
+                s->z_eof = 1;\r
+                if (ferror(s->file)) {\r
+                    s->z_err = Z_ERRNO;\r
+                    break;\r
+                }\r
+            }\r
+            s->stream.next_in = s->inbuf;\r
+        }\r
+        s->in += s->stream.avail_in;\r
+        s->out += s->stream.avail_out;\r
+        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);\r
+        s->in -= s->stream.avail_in;\r
+        s->out -= s->stream.avail_out;\r
+\r
+        if (s->z_err == Z_STREAM_END) {\r
+            /* Check CRC and original size */\r
+            s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));\r
+            start = s->stream.next_out;\r
+\r
+            if (getLong(s) != s->crc) {\r
+                s->z_err = Z_DATA_ERROR;\r
+            } else {\r
+                (void)getLong(s);\r
+                /* The uncompressed length returned by above getlong() may be\r
+                 * different from s->out in case of concatenated .gz files.\r
+                 * Check for such files:\r
+                 */\r
+                check_header(s);\r
+                if (s->z_err == Z_OK) {\r
+                    inflateReset(&(s->stream));\r
+                    s->crc = crc32(0L, Z_NULL, 0);\r
+                }\r
+            }\r
+        }\r
+        if (s->z_err != Z_OK || s->z_eof) break;\r
+    }\r
+    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));\r
+\r
+    return (int)(len - s->stream.avail_out);\r
+}\r
+\r
+\r
+/* ===========================================================================\r
+      Reads one byte from the compressed file. gzgetc returns this byte\r
+   or -1 in case of end of file or error.\r
+*/\r
+int ZEXPORT gzgetc(file)\r
+    gzFile file;\r
+{\r
+    unsigned char c;\r
+\r
+    return gzread(file, &c, 1) == 1 ? c : -1;\r
+}\r
+\r
+\r
+/* ===========================================================================\r
+      Push one byte back onto the stream.\r
+*/\r
+int ZEXPORT gzungetc(c, file)\r
+    int c;\r
+    gzFile file;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;\r
+    s->back = c;\r
+    s->out--;\r
+    s->last = (s->z_err == Z_STREAM_END);\r
+    if (s->last) s->z_err = Z_OK;\r
+    s->z_eof = 0;\r
+    return c;\r
+}\r
+\r
+\r
+/* ===========================================================================\r
+      Reads bytes from the compressed file until len-1 characters are\r
+   read, or a newline character is read and transferred to buf, or an\r
+   end-of-file condition is encountered.  The string is then terminated\r
+   with a null character.\r
+      gzgets returns buf, or Z_NULL in case of error.\r
+\r
+      The current implementation is not optimized at all.\r
+*/\r
+char * ZEXPORT gzgets(file, buf, len)\r
+    gzFile file;\r
+    char *buf;\r
+    int len;\r
+{\r
+    char *b = buf;\r
+    if (buf == Z_NULL || len <= 0) return Z_NULL;\r
+\r
+    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;\r
+    *buf = '\0';\r
+    return b == buf && len > 0 ? Z_NULL : b;\r
+}\r
+\r
+\r
+#ifndef NO_GZCOMPRESS\r
+/* ===========================================================================\r
+     Writes the given number of uncompressed bytes into the compressed file.\r
+   gzwrite returns the number of bytes actually written (0 in case of error).\r
+*/\r
+int ZEXPORT gzwrite (file, buf, len)\r
+    gzFile file;\r
+    voidpc buf;\r
+    unsigned len;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;\r
+\r
+    s->stream.next_in = (Bytef*)buf;\r
+    s->stream.avail_in = len;\r
+\r
+    while (s->stream.avail_in != 0) {\r
+\r
+        if (s->stream.avail_out == 0) {\r
+\r
+            s->stream.next_out = s->outbuf;\r
+            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {\r
+                s->z_err = Z_ERRNO;\r
+                break;\r
+            }\r
+            s->stream.avail_out = Z_BUFSIZE;\r
+        }\r
+        s->in += s->stream.avail_in;\r
+        s->out += s->stream.avail_out;\r
+        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);\r
+        s->in -= s->stream.avail_in;\r
+        s->out -= s->stream.avail_out;\r
+        if (s->z_err != Z_OK) break;\r
+    }\r
+    s->crc = crc32(s->crc, (const Bytef *)buf, len);\r
+\r
+    return (int)(len - s->stream.avail_in);\r
+}\r
+\r
+\r
+/* ===========================================================================\r
+     Converts, formats, and writes the args to the compressed file under\r
+   control of the format string, as in fprintf. gzprintf returns the number of\r
+   uncompressed bytes actually written (0 in case of error).\r
+*/\r
+#ifdef STDC\r
+#include <stdarg.h>\r
+\r
+int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)\r
+{\r
+    char buf[Z_PRINTF_BUFSIZE];\r
+    va_list va;\r
+    int len;\r
+\r
+    buf[sizeof(buf) - 1] = 0;\r
+    va_start(va, format);\r
+#ifdef NO_vsnprintf\r
+#  ifdef HAS_vsprintf_void\r
+    (void)vsprintf(buf, format, va);\r
+    va_end(va);\r
+    for (len = 0; len < sizeof(buf); len++)\r
+        if (buf[len] == 0) break;\r
+#  else\r
+    len = vsprintf(buf, format, va);\r
+    va_end(va);\r
+#  endif\r
+#else\r
+#  ifdef HAS_vsnprintf_void\r
+    (void)vsnprintf(buf, sizeof(buf), format, va);\r
+    va_end(va);\r
+    len = strlen(buf);\r
+#  else\r
+    len = vsnprintf(buf, sizeof(buf), format, va);\r
+    va_end(va);\r
+#  endif\r
+#endif\r
+    if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)\r
+        return 0;\r
+    return gzwrite(file, buf, (unsigned)len);\r
+}\r
+#else /* not ANSI C */\r
+\r
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,\r
+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)\r
+    gzFile file;\r
+    const char *format;\r
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,\r
+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;\r
+{\r
+    char buf[Z_PRINTF_BUFSIZE];\r
+    int len;\r
+\r
+    buf[sizeof(buf) - 1] = 0;\r
+#ifdef NO_snprintf\r
+#  ifdef HAS_sprintf_void\r
+    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,\r
+            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);\r
+    for (len = 0; len < sizeof(buf); len++)\r
+        if (buf[len] == 0) break;\r
+#  else\r
+    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,\r
+                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);\r
+#  endif\r
+#else\r
+#  ifdef HAS_snprintf_void\r
+    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,\r
+             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);\r
+    len = strlen(buf);\r
+#  else\r
+    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,\r
+                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);\r
+#  endif\r
+#endif\r
+    if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)\r
+        return 0;\r
+    return gzwrite(file, buf, len);\r
+}\r
+#endif\r
+\r
+/* ===========================================================================\r
+      Writes c, converted to an unsigned char, into the compressed file.\r
+   gzputc returns the value that was written, or -1 in case of error.\r
+*/\r
+int ZEXPORT gzputc(file, c)\r
+    gzFile file;\r
+    int c;\r
+{\r
+    unsigned char cc = (unsigned char) c; /* required for big endian systems */\r
+\r
+    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;\r
+}\r
+\r
+\r
+/* ===========================================================================\r
+      Writes the given null-terminated string to the compressed file, excluding\r
+   the terminating null character.\r
+      gzputs returns the number of characters written, or -1 in case of error.\r
+*/\r
+int ZEXPORT gzputs(file, s)\r
+    gzFile file;\r
+    const char *s;\r
+{\r
+    return gzwrite(file, (char*)s, (unsigned)strlen(s));\r
+}\r
+\r
+\r
+/* ===========================================================================\r
+     Flushes all pending output into the compressed file. The parameter\r
+   flush is as in the deflate() function.\r
+*/\r
+local int do_flush (file, flush)\r
+    gzFile file;\r
+    int flush;\r
+{\r
+    uInt len;\r
+    int done = 0;\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;\r
+\r
+    s->stream.avail_in = 0; /* should be zero already anyway */\r
+\r
+    for (;;) {\r
+        len = Z_BUFSIZE - s->stream.avail_out;\r
+\r
+        if (len != 0) {\r
+            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {\r
+                s->z_err = Z_ERRNO;\r
+                return Z_ERRNO;\r
+            }\r
+            s->stream.next_out = s->outbuf;\r
+            s->stream.avail_out = Z_BUFSIZE;\r
+        }\r
+        if (done) break;\r
+        s->out += s->stream.avail_out;\r
+        s->z_err = deflate(&(s->stream), flush);\r
+        s->out -= s->stream.avail_out;\r
+\r
+        /* Ignore the second of two consecutive flushes: */\r
+        if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;\r
+\r
+        /* deflate has finished flushing only when it hasn't used up\r
+         * all the available space in the output buffer:\r
+         */\r
+        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);\r
+\r
+        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;\r
+    }\r
+    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;\r
+}\r
+\r
+int ZEXPORT gzflush (file, flush)\r
+     gzFile file;\r
+     int flush;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+    int err = do_flush (file, flush);\r
+\r
+    if (err) return err;\r
+    fflush(s->file);\r
+    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;\r
+}\r
+#endif /* NO_GZCOMPRESS */\r
+\r
+/* ===========================================================================\r
+      Sets the starting position for the next gzread or gzwrite on the given\r
+   compressed file. The offset represents a number of bytes in the\r
+      gzseek returns the resulting offset location as measured in bytes from\r
+   the beginning of the uncompressed stream, or -1 in case of error.\r
+      SEEK_END is not implemented, returns error.\r
+      In this version of the library, gzseek can be extremely slow.\r
+*/\r
+z_off_t ZEXPORT gzseek (file, offset, whence)\r
+    gzFile file;\r
+    z_off_t offset;\r
+    int whence;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL || whence == SEEK_END ||\r
+        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {\r
+        return -1L;\r
+    }\r
+\r
+    if (s->mode == 'w') {\r
+#ifdef NO_GZCOMPRESS\r
+        return -1L;\r
+#else\r
+        if (whence == SEEK_SET) {\r
+            offset -= s->in;\r
+        }\r
+        if (offset < 0) return -1L;\r
+\r
+        /* At this point, offset is the number of zero bytes to write. */\r
+        if (s->inbuf == Z_NULL) {\r
+            s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */\r
+            if (s->inbuf == Z_NULL) return -1L;\r
+            zmemzero(s->inbuf, Z_BUFSIZE);\r
+        }\r
+        while (offset > 0)  {\r
+            uInt size = Z_BUFSIZE;\r
+            if (offset < Z_BUFSIZE) size = (uInt)offset;\r
+\r
+            size = gzwrite(file, s->inbuf, size);\r
+            if (size == 0) return -1L;\r
+\r
+            offset -= size;\r
+        }\r
+        return s->in;\r
+#endif\r
+    }\r
+    /* Rest of function is for reading only */\r
+\r
+    /* compute absolute position */\r
+    if (whence == SEEK_CUR) {\r
+        offset += s->out;\r
+    }\r
+    if (offset < 0) return -1L;\r
+\r
+    if (s->transparent) {\r
+        /* map to fseek */\r
+        s->back = EOF;\r
+        s->stream.avail_in = 0;\r
+        s->stream.next_in = s->inbuf;\r
+        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;\r
+\r
+        s->in = s->out = offset;\r
+        return offset;\r
+    }\r
+\r
+    /* For a negative seek, rewind and use positive seek */\r
+    if (offset >= s->out) {\r
+        offset -= s->out;\r
+    } else if (gzrewind(file) < 0) {\r
+        return -1L;\r
+    }\r
+    /* offset is now the number of bytes to skip. */\r
+\r
+    if (offset != 0 && s->outbuf == Z_NULL) {\r
+        s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);\r
+        if (s->outbuf == Z_NULL) return -1L;\r
+    }\r
+    if (offset && s->back != EOF) {\r
+        s->back = EOF;\r
+        s->out++;\r
+        offset--;\r
+        if (s->last) s->z_err = Z_STREAM_END;\r
+    }\r
+    while (offset > 0)  {\r
+        int size = Z_BUFSIZE;\r
+        if (offset < Z_BUFSIZE) size = (int)offset;\r
+\r
+        size = gzread(file, s->outbuf, (uInt)size);\r
+        if (size <= 0) return -1L;\r
+        offset -= size;\r
+    }\r
+    return s->out;\r
+}\r
+\r
+/* ===========================================================================\r
+     Rewinds input file.\r
+*/\r
+int ZEXPORT gzrewind (file)\r
+    gzFile file;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL || s->mode != 'r') return -1;\r
+\r
+    s->z_err = Z_OK;\r
+    s->z_eof = 0;\r
+    s->back = EOF;\r
+    s->stream.avail_in = 0;\r
+    s->stream.next_in = s->inbuf;\r
+    s->crc = crc32(0L, Z_NULL, 0);\r
+    if (!s->transparent) (void)inflateReset(&s->stream);\r
+    s->in = 0;\r
+    s->out = 0;\r
+    return fseek(s->file, s->start, SEEK_SET);\r
+}\r
+\r
+/* ===========================================================================\r
+     Returns the starting position for the next gzread or gzwrite on the\r
+   given compressed file. This position represents a number of bytes in the\r
+   uncompressed data stream.\r
+*/\r
+z_off_t ZEXPORT gztell (file)\r
+    gzFile file;\r
+{\r
+    return gzseek(file, 0L, SEEK_CUR);\r
+}\r
+\r
+/* ===========================================================================\r
+     Returns 1 when EOF has previously been detected reading the given\r
+   input stream, otherwise zero.\r
+*/\r
+int ZEXPORT gzeof (file)\r
+    gzFile file;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    /* With concatenated compressed files that can have embedded\r
+     * crc trailers, z_eof is no longer the only/best indicator of EOF\r
+     * on a gz_stream. Handle end-of-stream error explicitly here.\r
+     */\r
+    if (s == NULL || s->mode != 'r') return 0;\r
+    if (s->z_eof) return 1;\r
+    return s->z_err == Z_STREAM_END;\r
+}\r
+\r
+/* ===========================================================================\r
+   Outputs a long in LSB order to the given file\r
+*/\r
+local void putLong (file, x)\r
+    FILE *file;\r
+    uLong x;\r
+{\r
+    int n;\r
+    for (n = 0; n < 4; n++) {\r
+        fputc((int)(x & 0xff), file);\r
+        x >>= 8;\r
+    }\r
+}\r
+\r
+/* ===========================================================================\r
+   Reads a long in LSB order from the given gz_stream. Sets z_err in case\r
+   of error.\r
+*/\r
+local uLong getLong (s)\r
+    gz_stream *s;\r
+{\r
+    uLong x = (uLong)get_byte(s);\r
+    int c;\r
+\r
+    x += ((uLong)get_byte(s))<<8;\r
+    x += ((uLong)get_byte(s))<<16;\r
+    c = get_byte(s);\r
+    if (c == EOF) s->z_err = Z_DATA_ERROR;\r
+    x += ((uLong)c)<<24;\r
+    return x;\r
+}\r
+\r
+/* ===========================================================================\r
+     Flushes all pending output if necessary, closes the compressed file\r
+   and deallocates all the (de)compression state.\r
+*/\r
+int ZEXPORT gzclose (file)\r
+    gzFile file;\r
+{\r
+    int err;\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL) return Z_STREAM_ERROR;\r
+\r
+    if (s->mode == 'w') {\r
+#ifdef NO_GZCOMPRESS\r
+        return Z_STREAM_ERROR;\r
+#else\r
+        err = do_flush (file, Z_FINISH);\r
+        if (err != Z_OK) return destroy((gz_stream*)file);\r
+\r
+        putLong (s->file, s->crc);\r
+        putLong (s->file, (uLong)(s->in & 0xffffffff));\r
+#endif\r
+    }\r
+    return destroy((gz_stream*)file);\r
+}\r
+\r
+/* ===========================================================================\r
+     Returns the error message for the last error which occured on the\r
+   given compressed file. errnum is set to zlib error number. If an\r
+   error occured in the file system and not in the compression library,\r
+   errnum is set to Z_ERRNO and the application may consult errno\r
+   to get the exact error code.\r
+*/\r
+const char * ZEXPORT gzerror (file, errnum)\r
+    gzFile file;\r
+    int *errnum;\r
+{\r
+    char *m;\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL) {\r
+        *errnum = Z_STREAM_ERROR;\r
+        return (const char*)ERR_MSG(Z_STREAM_ERROR);\r
+    }\r
+    *errnum = s->z_err;\r
+    if (*errnum == Z_OK) return (const char*)"";\r
+\r
+    m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);\r
+\r
+    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);\r
+\r
+    TRYFREE(s->msg);\r
+    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);\r
+    if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);\r
+    strcpy(s->msg, s->path);\r
+    strcat(s->msg, ": ");\r
+    strcat(s->msg, m);\r
+    return (const char*)s->msg;\r
+}\r
+\r
+/* ===========================================================================\r
+     Clear the error and end-of-file flags, and do the same for the real file.\r
+*/\r
+void ZEXPORT gzclearerr (file)\r
+    gzFile file;\r
+{\r
+    gz_stream *s = (gz_stream*)file;\r
+\r
+    if (s == NULL) return;\r
+    if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;\r
+    s->z_eof = 0;\r
+    clearerr(s->file);\r
+}\r
diff --git a/win32port/zlib/gzlib.c b/win32port/zlib/gzlib.c
new file mode 100755 (executable)
index 0000000..65efced
--- /dev/null
@@ -0,0 +1,537 @@
+/* gzlib.c -- zlib functions common to reading and writing gzip files\r
+ * Copyright (C) 2004, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+#include "gzguts.h"\r
+\r
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0\r
+#  define LSEEK lseek64\r
+#else\r
+#  define LSEEK lseek\r
+#endif\r
+\r
+/* Local functions */\r
+local void gz_reset OF((gz_statep));\r
+local gzFile gz_open OF((const char *, int, const char *));\r
+\r
+#if defined UNDER_CE\r
+\r
+/* Map the Windows error number in ERROR to a locale-dependent error message\r
+   string and return a pointer to it.  Typically, the values for ERROR come\r
+   from GetLastError.\r
+\r
+   The string pointed to shall not be modified by the application, but may be\r
+   overwritten by a subsequent call to gz_strwinerror\r
+\r
+   The gz_strwinerror function does not change the current setting of\r
+   GetLastError. */\r
+char ZLIB_INTERNAL *gz_strwinerror (error)\r
+     DWORD error;\r
+{\r
+    static char buf[1024];\r
+\r
+    wchar_t *msgbuf;\r
+    DWORD lasterr = GetLastError();\r
+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM\r
+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,\r
+        NULL,\r
+        error,\r
+        0, /* Default language */\r
+        (LPVOID)&msgbuf,\r
+        0,\r
+        NULL);\r
+    if (chars != 0) {\r
+        /* If there is an \r\n appended, zap it.  */\r
+        if (chars >= 2\r
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {\r
+            chars -= 2;\r
+            msgbuf[chars] = 0;\r
+        }\r
+\r
+        if (chars > sizeof (buf) - 1) {\r
+            chars = sizeof (buf) - 1;\r
+            msgbuf[chars] = 0;\r
+        }\r
+\r
+        wcstombs(buf, msgbuf, chars + 1);\r
+        LocalFree(msgbuf);\r
+    }\r
+    else {\r
+        sprintf(buf, "unknown win32 error (%ld)", error);\r
+    }\r
+\r
+    SetLastError(lasterr);\r
+    return buf;\r
+}\r
+\r
+#endif /* UNDER_CE */\r
+\r
+/* Reset gzip file state */\r
+local void gz_reset(state)\r
+    gz_statep state;\r
+{\r
+    if (state->mode == GZ_READ) {   /* for reading ... */\r
+        state->have = 0;            /* no output data available */\r
+        state->eof = 0;             /* not at end of file */\r
+        state->how = LOOK;          /* look for gzip header */\r
+        state->direct = 1;          /* default for empty file */\r
+    }\r
+    state->seek = 0;                /* no seek request pending */\r
+    gz_error(state, Z_OK, NULL);    /* clear error */\r
+    state->pos = 0;                 /* no uncompressed data yet */\r
+    state->strm.avail_in = 0;       /* no input data yet */\r
+}\r
+\r
+/* Open a gzip file either by name or file descriptor. */\r
+local gzFile gz_open(path, fd, mode)\r
+    const char *path;\r
+    int fd;\r
+    const char *mode;\r
+{\r
+    gz_statep state;\r
+\r
+    /* allocate gzFile structure to return */\r
+    state = malloc(sizeof(gz_state));\r
+    if (state == NULL)\r
+        return NULL;\r
+    state->size = 0;            /* no buffers allocated yet */\r
+    state->want = GZBUFSIZE;    /* requested buffer size */\r
+    state->msg = NULL;          /* no error message yet */\r
+\r
+    /* interpret mode */\r
+    state->mode = GZ_NONE;\r
+    state->level = Z_DEFAULT_COMPRESSION;\r
+    state->strategy = Z_DEFAULT_STRATEGY;\r
+    while (*mode) {\r
+        if (*mode >= '0' && *mode <= '9')\r
+            state->level = *mode - '0';\r
+        else\r
+            switch (*mode) {\r
+            case 'r':\r
+                state->mode = GZ_READ;\r
+                break;\r
+#ifndef NO_GZCOMPRESS\r
+            case 'w':\r
+                state->mode = GZ_WRITE;\r
+                break;\r
+            case 'a':\r
+                state->mode = GZ_APPEND;\r
+                break;\r
+#endif\r
+            case '+':       /* can't read and write at the same time */\r
+                free(state);\r
+                return NULL;\r
+            case 'b':       /* ignore -- will request binary anyway */\r
+                break;\r
+            case 'f':\r
+                state->strategy = Z_FILTERED;\r
+                break;\r
+            case 'h':\r
+                state->strategy = Z_HUFFMAN_ONLY;\r
+                break;\r
+            case 'R':\r
+                state->strategy = Z_RLE;\r
+                break;\r
+            case 'F':\r
+                state->strategy = Z_FIXED;\r
+            default:        /* could consider as an error, but just ignore */\r
+                ;\r
+            }\r
+        mode++;\r
+    }\r
+\r
+    /* must provide an "r", "w", or "a" */\r
+    if (state->mode == GZ_NONE) {\r
+        free(state);\r
+        return NULL;\r
+    }\r
+\r
+    /* save the path name for error messages */\r
+    state->path = malloc(strlen(path) + 1);\r
+    if (state->path == NULL) {\r
+        free(state);\r
+        return NULL;\r
+    }\r
+    strcpy(state->path, path);\r
+\r
+    /* open the file with the appropriate mode (or just use fd) */\r
+    state->fd = fd != -1 ? fd :\r
+        open(path,\r
+#ifdef O_LARGEFILE\r
+            O_LARGEFILE |\r
+#endif\r
+#ifdef O_BINARY\r
+            O_BINARY |\r
+#endif\r
+            (state->mode == GZ_READ ?\r
+                O_RDONLY :\r
+                (O_WRONLY | O_CREAT | (\r
+                    state->mode == GZ_WRITE ?\r
+                        O_TRUNC :\r
+                        O_APPEND))),\r
+            0666);\r
+    if (state->fd == -1) {\r
+        free(state->path);\r
+        free(state);\r
+        return NULL;\r
+    }\r
+    if (state->mode == GZ_APPEND)\r
+        state->mode = GZ_WRITE;         /* simplify later checks */\r
+\r
+    /* save the current position for rewinding (only if reading) */\r
+    if (state->mode == GZ_READ) {\r
+        state->start = LSEEK(state->fd, 0, SEEK_CUR);\r
+        if (state->start == -1) state->start = 0;\r
+    }\r
+\r
+    /* initialize stream */\r
+    gz_reset(state);\r
+\r
+    /* return stream */\r
+    return (gzFile)state;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+gzFile ZEXPORT gzopen(path, mode)\r
+    const char *path;\r
+    const char *mode;\r
+{\r
+    return gz_open(path, -1, mode);\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+gzFile ZEXPORT gzopen64(path, mode)\r
+    const char *path;\r
+    const char *mode;\r
+{\r
+    return gz_open(path, -1, mode);\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+gzFile ZEXPORT gzdopen(fd, mode)\r
+    int fd;\r
+    const char *mode;\r
+{\r
+    char *path;         /* identifier for error messages */\r
+    gzFile gz;\r
+\r
+    if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)\r
+        return NULL;\r
+    sprintf(path, "<fd:%d>", fd);   /* for debugging */\r
+    gz = gz_open(path, fd, mode);\r
+    free(path);\r
+    return gz;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzbuffer(file, size)\r
+    gzFile file;\r
+    unsigned size;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure and check integrity */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)\r
+        return -1;\r
+\r
+    /* make sure we haven't already allocated memory */\r
+    if (state->size != 0)\r
+        return -1;\r
+\r
+    /* check and set requested size */\r
+    if (size == 0)\r
+        return -1;\r
+    state->want = size;\r
+    return 0;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzrewind(file)\r
+    gzFile file;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+\r
+    /* check that we're reading and that there's no error */\r
+    if (state->mode != GZ_READ || state->err != Z_OK)\r
+        return -1;\r
+\r
+    /* back up and start over */\r
+    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)\r
+        return -1;\r
+    gz_reset(state);\r
+    return 0;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+z_off64_t ZEXPORT gzseek64(file, offset, whence)\r
+    gzFile file;\r
+    z_off64_t offset;\r
+    int whence;\r
+{\r
+    unsigned n;\r
+    z_off64_t ret;\r
+    gz_statep state;\r
+\r
+    /* get internal structure and check integrity */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)\r
+        return -1;\r
+\r
+    /* check that there's no error */\r
+    if (state->err != Z_OK)\r
+        return -1;\r
+\r
+    /* can only seek from start or relative to current position */\r
+    if (whence != SEEK_SET && whence != SEEK_CUR)\r
+        return -1;\r
+\r
+    /* normalize offset to a SEEK_CUR specification */\r
+    if (whence == SEEK_SET)\r
+        offset -= state->pos;\r
+    else if (state->seek)\r
+        offset += state->skip;\r
+    state->seek = 0;\r
+\r
+    /* if within raw area while reading, just go there */\r
+    if (state->mode == GZ_READ && state->how == COPY &&\r
+        state->pos + offset >= state->raw) {\r
+        ret = LSEEK(state->fd, offset - state->have, SEEK_CUR);\r
+        if (ret == -1)\r
+            return -1;\r
+        state->have = 0;\r
+        state->eof = 0;\r
+        state->seek = 0;\r
+        gz_error(state, Z_OK, NULL);\r
+        state->strm.avail_in = 0;\r
+        state->pos += offset;\r
+        return state->pos;\r
+    }\r
+\r
+    /* calculate skip amount, rewinding if needed for back seek when reading */\r
+    if (offset < 0) {\r
+        if (state->mode != GZ_READ)         /* writing -- can't go backwards */\r
+            return -1;\r
+        offset += state->pos;\r
+        if (offset < 0)                     /* before start of file! */\r
+            return -1;\r
+        if (gzrewind(file) == -1)           /* rewind, then skip to offset */\r
+            return -1;\r
+    }\r
+\r
+    /* if reading, skip what's in output buffer (one less gzgetc() check) */\r
+    if (state->mode == GZ_READ) {\r
+        n = GT_OFF(state->have) || (z_off64_t)state->have > offset ?\r
+            (unsigned)offset : state->have;\r
+        state->have -= n;\r
+        state->next += n;\r
+        state->pos += n;\r
+        offset -= n;\r
+    }\r
+\r
+    /* request skip (if not zero) */\r
+    if (offset) {\r
+        state->seek = 1;\r
+        state->skip = offset;\r
+    }\r
+    return state->pos + offset;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+z_off_t ZEXPORT gzseek(file, offset, whence)\r
+    gzFile file;\r
+    z_off_t offset;\r
+    int whence;\r
+{\r
+    z_off64_t ret;\r
+\r
+    ret = gzseek64(file, (z_off64_t)offset, whence);\r
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+z_off64_t ZEXPORT gztell64(file)\r
+    gzFile file;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure and check integrity */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)\r
+        return -1;\r
+\r
+    /* return position */\r
+    return state->pos + (state->seek ? state->skip : 0);\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+z_off_t ZEXPORT gztell(file)\r
+    gzFile file;\r
+{\r
+    z_off64_t ret;\r
+\r
+    ret = gztell64(file);\r
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+z_off64_t ZEXPORT gzoffset64(file)\r
+    gzFile file;\r
+{\r
+    z_off64_t offset;\r
+    gz_statep state;\r
+\r
+    /* get internal structure and check integrity */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)\r
+        return -1;\r
+\r
+    /* compute and return effective offset in file */\r
+    offset = LSEEK(state->fd, 0, SEEK_CUR);\r
+    if (offset == -1)\r
+        return -1;\r
+    if (state->mode == GZ_READ)             /* reading */\r
+        offset -= state->strm.avail_in;     /* don't count buffered input */\r
+    return offset;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+z_off_t ZEXPORT gzoffset(file)\r
+    gzFile file;\r
+{\r
+    z_off64_t ret;\r
+\r
+    ret = gzoffset64(file);\r
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzeof(file)\r
+    gzFile file;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure and check integrity */\r
+    if (file == NULL)\r
+        return 0;\r
+    state = (gz_statep)file;\r
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)\r
+        return 0;\r
+\r
+    /* return end-of-file state */\r
+    return state->mode == GZ_READ ?\r
+        (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+const char * ZEXPORT gzerror(file, errnum)\r
+    gzFile file;\r
+    int *errnum;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure and check integrity */\r
+    if (file == NULL)\r
+        return NULL;\r
+    state = (gz_statep)file;\r
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)\r
+        return NULL;\r
+\r
+    /* return error information */\r
+    if (errnum != NULL)\r
+        *errnum = state->err;\r
+    return state->msg == NULL ? "" : state->msg;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+void ZEXPORT gzclearerr(file)\r
+    gzFile file;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure and check integrity */\r
+    if (file == NULL)\r
+        return;\r
+    state = (gz_statep)file;\r
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)\r
+        return;\r
+\r
+    /* clear error and end-of-file */\r
+    if (state->mode == GZ_READ)\r
+        state->eof = 0;\r
+    gz_error(state, Z_OK, NULL);\r
+}\r
+\r
+/* Create an error message in allocated memory and set state->err and\r
+   state->msg accordingly.  Free any previous error message already there.  Do\r
+   not try to free or allocate space if the error is Z_MEM_ERROR (out of\r
+   memory).  Simply save the error message as a static string.  If there is an\r
+   allocation failure constructing the error message, then convert the error to\r
+   out of memory. */\r
+void ZLIB_INTERNAL gz_error(state, err, msg)\r
+    gz_statep state;\r
+    int err;\r
+    const char *msg;\r
+{\r
+    /* free previously allocated message and clear */\r
+    if (state->msg != NULL) {\r
+        if (state->err != Z_MEM_ERROR)\r
+            free(state->msg);\r
+        state->msg = NULL;\r
+    }\r
+\r
+    /* set error code, and if no message, then done */\r
+    state->err = err;\r
+    if (msg == NULL)\r
+        return;\r
+\r
+    /* for an out of memory error, save as static string */\r
+    if (err == Z_MEM_ERROR) {\r
+        state->msg = (char *)msg;\r
+        return;\r
+    }\r
+\r
+    /* construct error message with path */\r
+    if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {\r
+        state->err = Z_MEM_ERROR;\r
+        state->msg = (char *)"out of memory";\r
+        return;\r
+    }\r
+    strcpy(state->msg, state->path);\r
+    strcat(state->msg, ": ");\r
+    strcat(state->msg, msg);\r
+    return;\r
+}\r
+\r
+#ifndef INT_MAX\r
+/* portably return maximum value for an int (when limits.h presumed not\r
+   available) -- we need to do this to cover cases where 2's complement not\r
+   used, since C standard permits 1's complement and sign-bit representations,\r
+   otherwise we could just use ((unsigned)-1) >> 1 */\r
+unsigned ZLIB_INTERNAL gz_intmax()\r
+{\r
+    unsigned p, q;\r
+\r
+    p = 1;\r
+    do {\r
+        q = p;\r
+        p <<= 1;\r
+        p++;\r
+    } while (p > q);\r
+    return q >> 1;\r
+}\r
+#endif\r
diff --git a/win32port/zlib/gzread.c b/win32port/zlib/gzread.c
new file mode 100755 (executable)
index 0000000..0f8649b
--- /dev/null
@@ -0,0 +1,653 @@
+/* gzread.c -- zlib functions for reading gzip files\r
+ * Copyright (C) 2004, 2005, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+#include "gzguts.h"\r
+\r
+/* Local functions */\r
+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));\r
+local int gz_avail OF((gz_statep));\r
+local int gz_next4 OF((gz_statep, unsigned long *));\r
+local int gz_head OF((gz_statep));\r
+local int gz_decomp OF((gz_statep));\r
+local int gz_make OF((gz_statep));\r
+local int gz_skip OF((gz_statep, z_off64_t));\r
+\r
+/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from\r
+   state->fd, and update state->eof, state->err, and state->msg as appropriate.\r
+   This function needs to loop on read(), since read() is not guaranteed to\r
+   read the number of bytes requested, depending on the type of descriptor. */\r
+local int gz_load(state, buf, len, have)\r
+    gz_statep state;\r
+    unsigned char *buf;\r
+    unsigned len;\r
+    unsigned *have;\r
+{\r
+    int ret;\r
+\r
+    *have = 0;\r
+    do {\r
+        ret = read(state->fd, buf + *have, len - *have);\r
+        if (ret <= 0)\r
+            break;\r
+        *have += ret;\r
+    } while (*have < len);\r
+    if (ret < 0) {\r
+        gz_error(state, Z_ERRNO, zstrerror());\r
+        return -1;\r
+    }\r
+    if (ret == 0)\r
+        state->eof = 1;\r
+    return 0;\r
+}\r
+\r
+/* Load up input buffer and set eof flag if last data loaded -- return -1 on\r
+   error, 0 otherwise.  Note that the eof flag is set when the end of the input\r
+   file is reached, even though there may be unused data in the buffer.  Once\r
+   that data has been used, no more attempts will be made to read the file.\r
+   gz_avail() assumes that strm->avail_in == 0. */\r
+local int gz_avail(state)\r
+    gz_statep state;\r
+{\r
+    z_streamp strm = &(state->strm);\r
+\r
+    if (state->err != Z_OK)\r
+        return -1;\r
+    if (state->eof == 0) {\r
+        if (gz_load(state, state->in, state->size,\r
+                (unsigned *)&(strm->avail_in)) == -1)\r
+            return -1;\r
+        strm->next_in = state->in;\r
+    }\r
+    return 0;\r
+}\r
+\r
+/* Get next byte from input, or -1 if end or error. */\r
+#define NEXT() ((strm->avail_in == 0 && gz_avail(state) == -1) ? -1 : \\r
+                (strm->avail_in == 0 ? -1 : \\r
+                 (strm->avail_in--, *(strm->next_in)++)))\r
+\r
+/* Get a four-byte little-endian integer and return 0 on success and the value\r
+   in *ret.  Otherwise -1 is returned and *ret is not modified. */\r
+local int gz_next4(state, ret)\r
+    gz_statep state;\r
+    unsigned long *ret;\r
+{\r
+    int ch;\r
+    unsigned long val;\r
+    z_streamp strm = &(state->strm);\r
+\r
+    val = NEXT();\r
+    val += (unsigned)NEXT() << 8;\r
+    val += (unsigned long)NEXT() << 16;\r
+    ch = NEXT();\r
+    if (ch == -1)\r
+        return -1;\r
+    val += (unsigned long)ch << 24;\r
+    *ret = val;\r
+    return 0;\r
+}\r
+\r
+/* Look for gzip header, set up for inflate or copy.  state->have must be zero.\r
+   If this is the first time in, allocate required memory.  state->how will be\r
+   left unchanged if there is no more input data available, will be set to COPY\r
+   if there is no gzip header and direct copying will be performed, or it will\r
+   be set to GZIP for decompression, and the gzip header will be skipped so\r
+   that the next available input data is the raw deflate stream.  If direct\r
+   copying, then leftover input data from the input buffer will be copied to\r
+   the output buffer.  In that case, all further file reads will be directly to\r
+   either the output buffer or a user buffer.  If decompressing, the inflate\r
+   state and the check value will be initialized.  gz_head() will return 0 on\r
+   success or -1 on failure.  Failures may include read errors or gzip header\r
+   errors.  */\r
+local int gz_head(state)\r
+    gz_statep state;\r
+{\r
+    z_streamp strm = &(state->strm);\r
+    int flags;\r
+    unsigned len;\r
+\r
+    /* allocate read buffers and inflate memory */\r
+    if (state->size == 0) {\r
+        /* allocate buffers */\r
+        state->in = malloc(state->want);\r
+        state->out = malloc(state->want << 1);\r
+        if (state->in == NULL || state->out == NULL) {\r
+            if (state->out != NULL)\r
+                free(state->out);\r
+            if (state->in != NULL)\r
+                free(state->in);\r
+            gz_error(state, Z_MEM_ERROR, "out of memory");\r
+            return -1;\r
+        }\r
+        state->size = state->want;\r
+\r
+        /* allocate inflate memory */\r
+        state->strm.zalloc = Z_NULL;\r
+        state->strm.zfree = Z_NULL;\r
+        state->strm.opaque = Z_NULL;\r
+        state->strm.avail_in = 0;\r
+        state->strm.next_in = Z_NULL;\r
+        if (inflateInit2(&(state->strm), -15) != Z_OK) {    /* raw inflate */\r
+            free(state->out);\r
+            free(state->in);\r
+            state->size = 0;\r
+            gz_error(state, Z_MEM_ERROR, "out of memory");\r
+            return -1;\r
+        }\r
+    }\r
+\r
+    /* get some data in the input buffer */\r
+    if (strm->avail_in == 0) {\r
+        if (gz_avail(state) == -1)\r
+            return -1;\r
+        if (strm->avail_in == 0)\r
+            return 0;\r
+    }\r
+\r
+    /* look for the gzip magic header bytes 31 and 139 */\r
+    if (strm->next_in[0] == 31) {\r
+        strm->avail_in--;\r
+        strm->next_in++;\r
+        if (strm->avail_in == 0 && gz_avail(state) == -1)\r
+            return -1;\r
+        if (strm->avail_in && strm->next_in[0] == 139) {\r
+            /* we have a gzip header, woo hoo! */\r
+            strm->avail_in--;\r
+            strm->next_in++;\r
+\r
+            /* skip rest of header */\r
+            if (NEXT() != 8) {      /* compression method */\r
+                gz_error(state, Z_DATA_ERROR, "unknown compression method");\r
+                return -1;\r
+            }\r
+            flags = NEXT();\r
+            if (flags & 0xe0) {     /* reserved flag bits */\r
+                gz_error(state, Z_DATA_ERROR, "unknown header flags set");\r
+                return -1;\r
+            }\r
+            NEXT();                 /* modification time */\r
+            NEXT();\r
+            NEXT();\r
+            NEXT();\r
+            NEXT();                 /* extra flags */\r
+            NEXT();                 /* operating system */\r
+            if (flags & 4) {        /* extra field */\r
+                len = (unsigned)NEXT();\r
+                len += (unsigned)NEXT() << 8;\r
+                while (len--)\r
+                    if (NEXT() < 0)\r
+                        break;\r
+            }\r
+            if (flags & 8)          /* file name */\r
+                while (NEXT() > 0)\r
+                    ;\r
+            if (flags & 16)         /* comment */\r
+                while (NEXT() > 0)\r
+                    ;\r
+            if (flags & 2) {        /* header crc */\r
+                NEXT();\r
+                NEXT();\r
+            }\r
+            /* an unexpected end of file is not checked for here -- it will be\r
+               noticed on the first request for uncompressed data */\r
+\r
+            /* set up for decompression */\r
+            inflateReset(strm);\r
+            strm->adler = crc32(0L, Z_NULL, 0);\r
+            state->how = GZIP;\r
+            state->direct = 0;\r
+            return 0;\r
+        }\r
+        else {\r
+            /* not a gzip file -- save first byte (31) and fall to raw i/o */\r
+            state->out[0] = 31;\r
+            state->have = 1;\r
+        }\r
+    }\r
+\r
+    /* doing raw i/o, save start of raw data for seeking, copy any leftover\r
+       input to output -- this assumes that the output buffer is larger than\r
+       the input buffer, which also assures space for gzungetc() */\r
+    state->raw = state->pos;\r
+    state->next = state->out;\r
+    if (strm->avail_in) {\r
+        memcpy(state->next + state->have, strm->next_in, strm->avail_in);\r
+        state->have += strm->avail_in;\r
+        strm->avail_in = 0;\r
+    }\r
+    state->how = COPY;\r
+    state->direct = 1;\r
+    return 0;\r
+}\r
+\r
+/* Decompress from input to the provided next_out and avail_out in the state.\r
+   If the end of the compressed data is reached, then verify the gzip trailer\r
+   check value and length (modulo 2^32).  state->have and state->next are set\r
+   to point to the just decompressed data, and the crc is updated.  If the\r
+   trailer is verified, state->how is reset to LOOK to look for the next gzip\r
+   stream or raw data, once state->have is depleted.  Returns 0 on success, -1\r
+   on failure.  Failures may include invalid compressed data or a failed gzip\r
+   trailer verification. */\r
+local int gz_decomp(state)\r
+    gz_statep state;\r
+{\r
+    int ret;\r
+    unsigned had;\r
+    unsigned long crc, len;\r
+    z_streamp strm = &(state->strm);\r
+\r
+    /* fill output buffer up to end of deflate stream */\r
+    had = strm->avail_out;\r
+    do {\r
+        /* get more input for inflate() */\r
+        if (strm->avail_in == 0 && gz_avail(state) == -1)\r
+            return -1;\r
+        if (strm->avail_in == 0) {\r
+            gz_error(state, Z_DATA_ERROR, "unexpected end of file");\r
+            return -1;\r
+        }\r
+\r
+        /* decompress and handle errors */\r
+        ret = inflate(strm, Z_NO_FLUSH);\r
+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {\r
+            gz_error(state, Z_STREAM_ERROR,\r
+                      "internal error: inflate stream corrupt");\r
+            return -1;\r
+        }\r
+        if (ret == Z_MEM_ERROR) {\r
+            gz_error(state, Z_MEM_ERROR, "out of memory");\r
+            return -1;\r
+        }\r
+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */\r
+            gz_error(state, Z_DATA_ERROR,\r
+                      strm->msg == NULL ? "compressed data error" : strm->msg);\r
+            return -1;\r
+        }\r
+    } while (strm->avail_out && ret != Z_STREAM_END);\r
+\r
+    /* update available output and crc check value */\r
+    state->have = had - strm->avail_out;\r
+    state->next = strm->next_out - state->have;\r
+    strm->adler = crc32(strm->adler, state->next, state->have);\r
+\r
+    /* check gzip trailer if at end of deflate stream */\r
+    if (ret == Z_STREAM_END) {\r
+        if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) {\r
+            gz_error(state, Z_DATA_ERROR, "unexpected end of file");\r
+            return -1;\r
+        }\r
+        if (crc != strm->adler) {\r
+            gz_error(state, Z_DATA_ERROR, "incorrect data check");\r
+            return -1;\r
+        }\r
+        if (len != (strm->total_out & 0xffffffffL)) {\r
+            gz_error(state, Z_DATA_ERROR, "incorrect length check");\r
+            return -1;\r
+        }\r
+        state->how = LOOK;      /* ready for next stream, once have is 0 (leave\r
+                                   state->direct unchanged to remember how) */\r
+    }\r
+\r
+    /* good decompression */\r
+    return 0;\r
+}\r
+\r
+/* Make data and put in the output buffer.  Assumes that state->have == 0.\r
+   Data is either copied from the input file or decompressed from the input\r
+   file depending on state->how.  If state->how is LOOK, then a gzip header is\r
+   looked for (and skipped if found) to determine wither to copy or decompress.\r
+   Returns -1 on error, otherwise 0.  gz_make() will leave state->have as COPY\r
+   or GZIP unless the end of the input file has been reached and all data has\r
+   been processed.  */\r
+local int gz_make(state)\r
+    gz_statep state;\r
+{\r
+    z_streamp strm = &(state->strm);\r
+\r
+    if (state->how == LOOK) {           /* look for gzip header */\r
+        if (gz_head(state) == -1)\r
+            return -1;\r
+        if (state->have)                /* got some data from gz_head() */\r
+            return 0;\r
+    }\r
+    if (state->how == COPY) {           /* straight copy */\r
+        if (gz_load(state, state->out, state->size << 1, &(state->have)) == -1)\r
+            return -1;\r
+        state->next = state->out;\r
+    }\r
+    else if (state->how == GZIP) {      /* decompress */\r
+        strm->avail_out = state->size << 1;\r
+        strm->next_out = state->out;\r
+        if (gz_decomp(state) == -1)\r
+            return -1;\r
+    }\r
+    return 0;\r
+}\r
+\r
+/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */\r
+local int gz_skip(state, len)\r
+    gz_statep state;\r
+    z_off64_t len;\r
+{\r
+    unsigned n;\r
+\r
+    /* skip over len bytes or reach end-of-file, whichever comes first */\r
+    while (len)\r
+        /* skip over whatever is in output buffer */\r
+        if (state->have) {\r
+            n = GT_OFF(state->have) || (z_off64_t)state->have > len ?\r
+                (unsigned)len : state->have;\r
+            state->have -= n;\r
+            state->next += n;\r
+            state->pos += n;\r
+            len -= n;\r
+        }\r
+\r
+        /* output buffer empty -- return if we're at the end of the input */\r
+        else if (state->eof && state->strm.avail_in == 0)\r
+            break;\r
+\r
+        /* need more data to skip -- load up output buffer */\r
+        else {\r
+            /* get more output, looking for header if required */\r
+            if (gz_make(state) == -1)\r
+                return -1;\r
+        }\r
+    return 0;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzread(file, buf, len)\r
+    gzFile file;\r
+    voidp buf;\r
+    unsigned len;\r
+{\r
+    unsigned got, n;\r
+    gz_statep state;\r
+    z_streamp strm;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+    strm = &(state->strm);\r
+\r
+    /* check that we're reading and that there's no error */\r
+    if (state->mode != GZ_READ || state->err != Z_OK)\r
+        return -1;\r
+\r
+    /* since an int is returned, make sure len fits in one, otherwise return\r
+       with an error (this avoids the flaw in the interface) */\r
+    if ((int)len < 0) {\r
+        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");\r
+        return -1;\r
+    }\r
+\r
+    /* if len is zero, avoid unnecessary operations */\r
+    if (len == 0)\r
+        return 0;\r
+\r
+    /* process a skip request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_skip(state, state->skip) == -1)\r
+            return -1;\r
+    }\r
+\r
+    /* get len bytes to buf, or less than len if at the end */\r
+    got = 0;\r
+    do {\r
+        /* first just try copying data from the output buffer */\r
+        if (state->have) {\r
+            n = state->have > len ? len : state->have;\r
+            memcpy(buf, state->next, n);\r
+            state->next += n;\r
+            state->have -= n;\r
+        }\r
+\r
+        /* output buffer empty -- return if we're at the end of the input */\r
+        else if (state->eof && strm->avail_in == 0)\r
+            break;\r
+\r
+        /* need output data -- for small len or new stream load up our output\r
+           buffer */\r
+        else if (state->how == LOOK || len < (state->size << 1)) {\r
+            /* get more output, looking for header if required */\r
+            if (gz_make(state) == -1)\r
+                return -1;\r
+            continue;       /* no progress yet -- go back to memcpy() above */\r
+            /* the copy above assures that we will leave with space in the\r
+               output buffer, allowing at least one gzungetc() to succeed */\r
+        }\r
+\r
+        /* large len -- read directly into user buffer */\r
+        else if (state->how == COPY) {      /* read directly */\r
+            if (gz_load(state, buf, len, &n) == -1)\r
+                return -1;\r
+        }\r
+\r
+        /* large len -- decompress directly into user buffer */\r
+        else {  /* state->how == GZIP */\r
+            strm->avail_out = len;\r
+            strm->next_out = buf;\r
+            if (gz_decomp(state) == -1)\r
+                return -1;\r
+            n = state->have;\r
+            state->have = 0;\r
+        }\r
+\r
+        /* update progress */\r
+        len -= n;\r
+        buf = (char *)buf + n;\r
+        got += n;\r
+        state->pos += n;\r
+    } while (len);\r
+\r
+    /* return number of bytes read into user buffer (will fit in int) */\r
+    return (int)got;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzgetc(file)\r
+    gzFile file;\r
+{\r
+    int ret;\r
+    unsigned char buf[1];\r
+    gz_statep state;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+\r
+    /* check that we're reading and that there's no error */\r
+    if (state->mode != GZ_READ || state->err != Z_OK)\r
+        return -1;\r
+\r
+    /* try output buffer (no need to check for skip request) */\r
+    if (state->have) {\r
+        state->have--;\r
+        state->pos++;\r
+        return *(state->next)++;\r
+    }\r
+\r
+    /* nothing there -- try gzread() */\r
+    ret = gzread(file, buf, 1);\r
+    return ret < 1 ? -1 : buf[0];\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzungetc(c, file)\r
+    int c;\r
+    gzFile file;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+\r
+    /* check that we're reading and that there's no error */\r
+    if (state->mode != GZ_READ || state->err != Z_OK)\r
+        return -1;\r
+\r
+    /* process a skip request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_skip(state, state->skip) == -1)\r
+            return -1;\r
+    }\r
+\r
+    /* can't push EOF */\r
+    if (c < 0)\r
+        return -1;\r
+\r
+    /* if output buffer empty, put byte at end (allows more pushing) */\r
+    if (state->have == 0) {\r
+        state->have = 1;\r
+        state->next = state->out + (state->size << 1) - 1;\r
+        state->next[0] = c;\r
+        state->pos--;\r
+        return c;\r
+    }\r
+\r
+    /* if no room, give up (must have already done a gzungetc()) */\r
+    if (state->have == (state->size << 1)) {\r
+        gz_error(state, Z_BUF_ERROR, "out of room to push characters");\r
+        return -1;\r
+    }\r
+\r
+    /* slide output data if needed and insert byte before existing data */\r
+    if (state->next == state->out) {\r
+        unsigned char *src = state->out + state->have;\r
+        unsigned char *dest = state->out + (state->size << 1);\r
+        while (src > state->out)\r
+            *--dest = *--src;\r
+        state->next = dest;\r
+    }\r
+    state->have++;\r
+    state->next--;\r
+    state->next[0] = c;\r
+    state->pos--;\r
+    return c;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+char * ZEXPORT gzgets(file, buf, len)\r
+    gzFile file;\r
+    char *buf;\r
+    int len;\r
+{\r
+    unsigned left, n;\r
+    char *str;\r
+    unsigned char *eol;\r
+    gz_statep state;\r
+\r
+    /* check parameters and get internal structure */\r
+    if (file == NULL || buf == NULL || len < 1)\r
+        return NULL;\r
+    state = (gz_statep)file;\r
+\r
+    /* check that we're reading and that there's no error */\r
+    if (state->mode != GZ_READ || state->err != Z_OK)\r
+        return NULL;\r
+\r
+    /* process a skip request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_skip(state, state->skip) == -1)\r
+            return NULL;\r
+    }\r
+\r
+    /* copy output bytes up to new line or len - 1, whichever comes first --\r
+       append a terminating zero to the string (we don't check for a zero in\r
+       the contents, let the user worry about that) */\r
+    str = buf;\r
+    left = (unsigned)len - 1;\r
+    if (left) do {\r
+        /* assure that something is in the output buffer */\r
+        if (state->have == 0) {\r
+            if (gz_make(state) == -1)\r
+                return NULL;            /* error */\r
+            if (state->have == 0) {     /* end of file */\r
+                if (buf == str)         /* got bupkus */\r
+                    return NULL;\r
+                break;                  /* got something -- return it */\r
+            }\r
+        }\r
+\r
+        /* look for end-of-line in current output buffer */\r
+        n = state->have > left ? left : state->have;\r
+        eol = memchr(state->next, '\n', n);\r
+        if (eol != NULL)\r
+            n = (unsigned)(eol - state->next) + 1;\r
+\r
+        /* copy through end-of-line, or remainder if not found */\r
+        memcpy(buf, state->next, n);\r
+        state->have -= n;\r
+        state->next += n;\r
+        state->pos += n;\r
+        left -= n;\r
+        buf += n;\r
+    } while (left && eol == NULL);\r
+\r
+    /* found end-of-line or out of space -- terminate string and return it */\r
+    buf[0] = 0;\r
+    return str;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzdirect(file)\r
+    gzFile file;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return 0;\r
+    state = (gz_statep)file;\r
+\r
+    /* check that we're reading */\r
+    if (state->mode != GZ_READ)\r
+        return 0;\r
+\r
+    /* if the state is not known, but we can find out, then do so (this is\r
+       mainly for right after a gzopen() or gzdopen()) */\r
+    if (state->how == LOOK && state->have == 0)\r
+        (void)gz_head(state);\r
+\r
+    /* return 1 if reading direct, 0 if decompressing a gzip stream */\r
+    return state->direct;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzclose_r(file)\r
+    gzFile file;\r
+{\r
+    int ret;\r
+    gz_statep state;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return Z_STREAM_ERROR;\r
+    state = (gz_statep)file;\r
+\r
+    /* check that we're reading */\r
+    if (state->mode != GZ_READ)\r
+        return Z_STREAM_ERROR;\r
+\r
+    /* free memory and close file */\r
+    if (state->size) {\r
+        inflateEnd(&(state->strm));\r
+        free(state->out);\r
+        free(state->in);\r
+    }\r
+    gz_error(state, Z_OK, NULL);\r
+    free(state->path);\r
+    ret = close(state->fd);\r
+    free(state);\r
+    return ret ? Z_ERRNO : Z_OK;\r
+}\r
diff --git a/win32port/zlib/gzwrite.c b/win32port/zlib/gzwrite.c
new file mode 100755 (executable)
index 0000000..e2bcf9d
--- /dev/null
@@ -0,0 +1,531 @@
+/* gzwrite.c -- zlib functions for writing gzip files\r
+ * Copyright (C) 2004, 2005, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+#include "gzguts.h"\r
+\r
+/* Local functions */\r
+local int gz_init OF((gz_statep));\r
+local int gz_comp OF((gz_statep, int));\r
+local int gz_zero OF((gz_statep, z_off64_t));\r
+\r
+/* Initialize state for writing a gzip file.  Mark initialization by setting\r
+   state->size to non-zero.  Return -1 on failure or 0 on success. */\r
+local int gz_init(state)\r
+    gz_statep state;\r
+{\r
+    int ret;\r
+    z_streamp strm = &(state->strm);\r
+\r
+    /* allocate input and output buffers */\r
+    state->in = malloc(state->want);\r
+    state->out = malloc(state->want);\r
+    if (state->in == NULL || state->out == NULL) {\r
+        if (state->out != NULL)\r
+            free(state->out);\r
+        if (state->in != NULL)\r
+            free(state->in);\r
+        gz_error(state, Z_MEM_ERROR, "out of memory");\r
+        return -1;\r
+    }\r
+\r
+    /* allocate deflate memory, set up for gzip compression */\r
+    strm->zalloc = Z_NULL;\r
+    strm->zfree = Z_NULL;\r
+    strm->opaque = Z_NULL;\r
+    ret = deflateInit2(strm, state->level, Z_DEFLATED,\r
+                       15 + 16, 8, state->strategy);\r
+    if (ret != Z_OK) {\r
+        free(state->in);\r
+        gz_error(state, Z_MEM_ERROR, "out of memory");\r
+        return -1;\r
+    }\r
+\r
+    /* mark state as initialized */\r
+    state->size = state->want;\r
+\r
+    /* initialize write buffer */\r
+    strm->avail_out = state->size;\r
+    strm->next_out = state->out;\r
+    state->next = strm->next_out;\r
+    return 0;\r
+}\r
+\r
+/* Compress whatever is at avail_in and next_in and write to the output file.\r
+   Return -1 if there is an error writing to the output file, otherwise 0.\r
+   flush is assumed to be a valid deflate() flush value.  If flush is Z_FINISH,\r
+   then the deflate() state is reset to start a new gzip stream. */\r
+local int gz_comp(state, flush)\r
+    gz_statep state;\r
+    int flush;\r
+{\r
+    int ret, got;\r
+    unsigned have;\r
+    z_streamp strm = &(state->strm);\r
+\r
+    /* allocate memory if this is the first time through */\r
+    if (state->size == 0 && gz_init(state) == -1)\r
+        return -1;\r
+\r
+    /* run deflate() on provided input until it produces no more output */\r
+    ret = Z_OK;\r
+    do {\r
+        /* write out current buffer contents if full, or if flushing, but if\r
+           doing Z_FINISH then don't write until we get to Z_STREAM_END */\r
+        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&\r
+            (flush != Z_FINISH || ret == Z_STREAM_END))) {\r
+            have = (unsigned)(strm->next_out - state->next);\r
+            if (have && ((got = write(state->fd, state->next, have)) < 0 ||\r
+                         (unsigned)got != have)) {\r
+                gz_error(state, Z_ERRNO, zstrerror());\r
+                return -1;\r
+            }\r
+            if (strm->avail_out == 0) {\r
+                strm->avail_out = state->size;\r
+                strm->next_out = state->out;\r
+            }\r
+            state->next = strm->next_out;\r
+        }\r
+\r
+        /* compress */\r
+        have = strm->avail_out;\r
+        ret = deflate(strm, flush);\r
+        if (ret == Z_STREAM_ERROR) {\r
+            gz_error(state, Z_STREAM_ERROR,\r
+                      "internal error: deflate stream corrupt");\r
+            return -1;\r
+        }\r
+        have -= strm->avail_out;\r
+    } while (have);\r
+\r
+    /* if that completed a deflate stream, allow another to start */\r
+    if (flush == Z_FINISH)\r
+        deflateReset(strm);\r
+\r
+    /* all done, no errors */\r
+    return 0;\r
+}\r
+\r
+/* Compress len zeros to output.  Return -1 on error, 0 on success. */\r
+local int gz_zero(state, len)\r
+    gz_statep state;\r
+    z_off64_t len;\r
+{\r
+    int first;\r
+    unsigned n;\r
+    z_streamp strm = &(state->strm);\r
+\r
+    /* consume whatever's left in the input buffer */\r
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)\r
+        return -1;\r
+\r
+    /* compress len zeros (len guaranteed > 0) */\r
+    first = 1;\r
+    while (len) {\r
+        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?\r
+            (unsigned)len : state->size;\r
+        if (first) {\r
+            memset(state->in, 0, n);\r
+            first = 0;\r
+        }\r
+        strm->avail_in = n;\r
+        strm->next_in = state->in;\r
+        state->pos += n;\r
+        if (gz_comp(state, Z_NO_FLUSH) == -1)\r
+            return -1;\r
+        len -= n;\r
+    }\r
+    return 0;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzwrite(file, buf, len)\r
+    gzFile file;\r
+    voidpc buf;\r
+    unsigned len;\r
+{\r
+    unsigned put = len;\r
+    unsigned n;\r
+    gz_statep state;\r
+    z_streamp strm;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return 0;\r
+    state = (gz_statep)file;\r
+    strm = &(state->strm);\r
+\r
+    /* check that we're writing and that there's no error */\r
+    if (state->mode != GZ_WRITE || state->err != Z_OK)\r
+        return 0;\r
+\r
+    /* since an int is returned, make sure len fits in one, otherwise return\r
+       with an error (this avoids the flaw in the interface) */\r
+    if ((int)len < 0) {\r
+        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");\r
+        return 0;\r
+    }\r
+\r
+    /* if len is zero, avoid unnecessary operations */\r
+    if (len == 0)\r
+        return 0;\r
+\r
+    /* allocate memory if this is the first time through */\r
+    if (state->size == 0 && gz_init(state) == -1)\r
+        return 0;\r
+\r
+    /* check for seek request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_zero(state, state->skip) == -1)\r
+            return 0;\r
+    }\r
+\r
+    /* for small len, copy to input buffer, otherwise compress directly */\r
+    if (len < state->size) {\r
+        /* copy to input buffer, compress when full */\r
+        do {\r
+            if (strm->avail_in == 0)\r
+                strm->next_in = state->in;\r
+            n = state->size - strm->avail_in;\r
+            if (n > len)\r
+                n = len;\r
+            memcpy(strm->next_in + strm->avail_in, buf, n);\r
+            strm->avail_in += n;\r
+            state->pos += n;\r
+            buf = (char *)buf + n;\r
+            len -= n;\r
+            if (len && gz_comp(state, Z_NO_FLUSH) == -1)\r
+                return 0;\r
+        } while (len);\r
+    }\r
+    else {\r
+        /* consume whatever's left in the input buffer */\r
+        if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)\r
+            return 0;\r
+\r
+        /* directly compress user buffer to file */\r
+        strm->avail_in = len;\r
+        strm->next_in = (voidp)buf;\r
+        state->pos += len;\r
+        if (gz_comp(state, Z_NO_FLUSH) == -1)\r
+            return 0;\r
+    }\r
+\r
+    /* input was all buffered or compressed (put will fit in int) */\r
+    return (int)put;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzputc(file, c)\r
+    gzFile file;\r
+    int c;\r
+{\r
+    unsigned char buf[1];\r
+    gz_statep state;\r
+    z_streamp strm;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+    strm = &(state->strm);\r
+\r
+    /* check that we're writing and that there's no error */\r
+    if (state->mode != GZ_WRITE || state->err != Z_OK)\r
+        return -1;\r
+\r
+    /* check for seek request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_zero(state, state->skip) == -1)\r
+            return -1;\r
+    }\r
+\r
+    /* try writing to input buffer for speed (state->size == 0 if buffer not\r
+       initialized) */\r
+    if (strm->avail_in < state->size) {\r
+        if (strm->avail_in == 0)\r
+            strm->next_in = state->in;\r
+        strm->next_in[strm->avail_in++] = c;\r
+        state->pos++;\r
+        return c;\r
+    }\r
+\r
+    /* no room in buffer or not initialized, use gz_write() */\r
+    buf[0] = c;\r
+    if (gzwrite(file, buf, 1) != 1)\r
+        return -1;\r
+    return c;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzputs(file, str)\r
+    gzFile file;\r
+    const char *str;\r
+{\r
+    int ret;\r
+    unsigned len;\r
+\r
+    /* write string */\r
+    len = (unsigned)strlen(str);\r
+    ret = gzwrite(file, str, len);\r
+    return ret == 0 && len != 0 ? -1 : ret;\r
+}\r
+\r
+#ifdef STDC\r
+#include <stdarg.h>\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)\r
+{\r
+    int size, len;\r
+    gz_statep state;\r
+    z_streamp strm;\r
+    va_list va;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+    strm = &(state->strm);\r
+\r
+    /* check that we're writing and that there's no error */\r
+    if (state->mode != GZ_WRITE || state->err != Z_OK)\r
+        return 0;\r
+\r
+    /* make sure we have some buffer space */\r
+    if (state->size == 0 && gz_init(state) == -1)\r
+        return 0;\r
+\r
+    /* check for seek request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_zero(state, state->skip) == -1)\r
+            return 0;\r
+    }\r
+\r
+    /* consume whatever's left in the input buffer */\r
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)\r
+        return 0;\r
+\r
+    /* do the printf() into the input buffer, put length in len */\r
+    size = (int)(state->size);\r
+    state->in[size - 1] = 0;\r
+    va_start(va, format);\r
+#ifdef NO_vsnprintf\r
+#  ifdef HAS_vsprintf_void\r
+    (void)vsprintf(state->in, format, va);\r
+    va_end(va);\r
+    for (len = 0; len < size; len++)\r
+        if (state->in[len] == 0) break;\r
+#  else\r
+    len = vsprintf(state->in, format, va);\r
+    va_end(va);\r
+#  endif\r
+#else\r
+#  ifdef HAS_vsnprintf_void\r
+    (void)vsnprintf(state->in, size, format, va);\r
+    va_end(va);\r
+    len = strlen(state->in);\r
+#  else\r
+    len = vsnprintf((char *)(state->in), size, format, va);\r
+    va_end(va);\r
+#  endif\r
+#endif\r
+\r
+    /* check that printf() results fit in buffer */\r
+    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)\r
+        return 0;\r
+\r
+    /* update buffer and position, defer compression until needed */\r
+    strm->avail_in = (unsigned)len;\r
+    strm->next_in = state->in;\r
+    state->pos += len;\r
+    return len;\r
+}\r
+\r
+#else /* !STDC */\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,\r
+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)\r
+    gzFile file;\r
+    const char *format;\r
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,\r
+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;\r
+{\r
+    int size, len;\r
+    gz_statep state;\r
+    z_streamp strm;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+    strm = &(state->strm);\r
+\r
+    /* check that we're writing and that there's no error */\r
+    if (state->mode != GZ_WRITE || state->err != Z_OK)\r
+        return 0;\r
+\r
+    /* make sure we have some buffer space */\r
+    if (state->size == 0 && gz_init(state) == -1)\r
+        return 0;\r
+\r
+    /* check for seek request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_zero(state, state->skip) == -1)\r
+            return 0;\r
+    }\r
+\r
+    /* consume whatever's left in the input buffer */\r
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)\r
+        return 0;\r
+\r
+    /* do the printf() into the input buffer, put length in len */\r
+    size = (int)(state->size);\r
+    state->in[size - 1] = 0;\r
+#ifdef NO_snprintf\r
+#  ifdef HAS_sprintf_void\r
+    sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,\r
+            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);\r
+    for (len = 0; len < size; len++)\r
+        if (state->in[len] == 0) break;\r
+#  else\r
+    len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,\r
+                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);\r
+#  endif\r
+#else\r
+#  ifdef HAS_snprintf_void\r
+    snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,\r
+             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);\r
+    len = strlen(state->in);\r
+#  else\r
+    len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,\r
+                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);\r
+#  endif\r
+#endif\r
+\r
+    /* check that printf() results fit in buffer */\r
+    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)\r
+        return 0;\r
+\r
+    /* update buffer and position, defer compression until needed */\r
+    strm->avail_in = (unsigned)len;\r
+    strm->next_in = state->in;\r
+    state->pos += len;\r
+    return len;\r
+}\r
+\r
+#endif\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzflush(file, flush)\r
+    gzFile file;\r
+    int flush;\r
+{\r
+    gz_statep state;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return -1;\r
+    state = (gz_statep)file;\r
+\r
+    /* check that we're writing and that there's no error */\r
+    if (state->mode != GZ_WRITE || state->err != Z_OK)\r
+        return Z_STREAM_ERROR;\r
+\r
+    /* check flush parameter */\r
+    if (flush < 0 || flush > Z_FINISH)\r
+        return Z_STREAM_ERROR;\r
+\r
+    /* check for seek request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_zero(state, state->skip) == -1)\r
+            return -1;\r
+    }\r
+\r
+    /* compress remaining data with requested flush */\r
+    gz_comp(state, flush);\r
+    return state->err;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzsetparams(file, level, strategy)\r
+    gzFile file;\r
+    int level;\r
+    int strategy;\r
+{\r
+    gz_statep state;\r
+    z_streamp strm;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return Z_STREAM_ERROR;\r
+    state = (gz_statep)file;\r
+    strm = &(state->strm);\r
+\r
+    /* check that we're writing and that there's no error */\r
+    if (state->mode != GZ_WRITE || state->err != Z_OK)\r
+        return Z_STREAM_ERROR;\r
+\r
+    /* if no change is requested, then do nothing */\r
+    if (level == state->level && strategy == state->strategy)\r
+        return Z_OK;\r
+\r
+    /* check for seek request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        if (gz_zero(state, state->skip) == -1)\r
+            return -1;\r
+    }\r
+\r
+    /* change compression parameters for subsequent input */\r
+    if (state->size) {\r
+        /* flush previous input with previous parameters before changing */\r
+        if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)\r
+            return state->err;\r
+        deflateParams(strm, level, strategy);\r
+    }\r
+    state->level = level;\r
+    state->strategy = strategy;\r
+    return Z_OK;\r
+}\r
+\r
+/* -- see zlib.h -- */\r
+int ZEXPORT gzclose_w(file)\r
+    gzFile file;\r
+{\r
+    int ret = 0;\r
+    gz_statep state;\r
+\r
+    /* get internal structure */\r
+    if (file == NULL)\r
+        return Z_STREAM_ERROR;\r
+    state = (gz_statep)file;\r
+\r
+    /* check that we're writing */\r
+    if (state->mode != GZ_WRITE)\r
+        return Z_STREAM_ERROR;\r
+\r
+    /* check for seek request */\r
+    if (state->seek) {\r
+        state->seek = 0;\r
+        ret += gz_zero(state, state->skip);\r
+    }\r
+\r
+    /* flush, free memory, and close file */\r
+    ret += gz_comp(state, Z_FINISH);\r
+    (void)deflateEnd(&(state->strm));\r
+    free(state->out);\r
+    free(state->in);\r
+    gz_error(state, Z_OK, NULL);\r
+    free(state->path);\r
+    ret += close(state->fd);\r
+    free(state);\r
+    return ret ? Z_ERRNO : Z_OK;\r
+}\r
diff --git a/win32port/zlib/infback.c b/win32port/zlib/infback.c
new file mode 100644 (file)
index 0000000..14770c5
--- /dev/null
@@ -0,0 +1,632 @@
+/* infback.c -- inflate using a call-back interface\r
+ * Copyright (C) 1995-2009 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/*\r
+   This code is largely copied from inflate.c.  Normally either infback.o or\r
+   inflate.o would be linked into an application--not both.  The interface\r
+   with inffast.c is retained so that optimized assembler-coded versions of\r
+   inflate_fast() can be used with either inflate.c or infback.c.\r
+ */\r
+\r
+#include "zutil.h"\r
+#include "inftrees.h"\r
+#include "inflate.h"\r
+#include "inffast.h"\r
+\r
+/* function prototypes */\r
+local void fixedtables OF((struct inflate_state FAR *state));\r
+\r
+/*\r
+   strm provides memory allocation functions in zalloc and zfree, or\r
+   Z_NULL to use the library memory allocation functions.\r
+\r
+   windowBits is in the range 8..15, and window is a user-supplied\r
+   window and output buffer that is 2**windowBits bytes.\r
+ */\r
+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)\r
+z_streamp strm;\r
+int windowBits;\r
+unsigned char FAR *window;\r
+const char *version;\r
+int stream_size;\r
+{\r
+    struct inflate_state FAR *state;\r
+\r
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||\r
+        stream_size != (int)(sizeof(z_stream)))\r
+        return Z_VERSION_ERROR;\r
+    if (strm == Z_NULL || window == Z_NULL ||\r
+        windowBits < 8 || windowBits > 15)\r
+        return Z_STREAM_ERROR;\r
+    strm->msg = Z_NULL;                 /* in case we return an error */\r
+    if (strm->zalloc == (alloc_func)0) {\r
+        strm->zalloc = zcalloc;\r
+        strm->opaque = (voidpf)0;\r
+    }\r
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;\r
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,\r
+                                               sizeof(struct inflate_state));\r
+    if (state == Z_NULL) return Z_MEM_ERROR;\r
+    Tracev((stderr, "inflate: allocated\n"));\r
+    strm->state = (struct internal_state FAR *)state;\r
+    state->dmax = 32768U;\r
+    state->wbits = windowBits;\r
+    state->wsize = 1U << windowBits;\r
+    state->window = window;\r
+    state->wnext = 0;\r
+    state->whave = 0;\r
+    return Z_OK;\r
+}\r
+\r
+/*\r
+   Return state with length and distance decoding tables and index sizes set to\r
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.\r
+   If BUILDFIXED is defined, then instead this routine builds the tables the\r
+   first time it's called, and returns those tables the first time and\r
+   thereafter.  This reduces the size of the code by about 2K bytes, in\r
+   exchange for a little execution time.  However, BUILDFIXED should not be\r
+   used for threaded applications, since the rewriting of the tables and virgin\r
+   may not be thread-safe.\r
+ */\r
+local void fixedtables(state)\r
+struct inflate_state FAR *state;\r
+{\r
+#ifdef BUILDFIXED\r
+    static int virgin = 1;\r
+    static code *lenfix, *distfix;\r
+    static code fixed[544];\r
+\r
+    /* build fixed huffman tables if first call (may not be thread safe) */\r
+    if (virgin) {\r
+        unsigned sym, bits;\r
+        static code *next;\r
+\r
+        /* literal/length table */\r
+        sym = 0;\r
+        while (sym < 144) state->lens[sym++] = 8;\r
+        while (sym < 256) state->lens[sym++] = 9;\r
+        while (sym < 280) state->lens[sym++] = 7;\r
+        while (sym < 288) state->lens[sym++] = 8;\r
+        next = fixed;\r
+        lenfix = next;\r
+        bits = 9;\r
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);\r
+\r
+        /* distance table */\r
+        sym = 0;\r
+        while (sym < 32) state->lens[sym++] = 5;\r
+        distfix = next;\r
+        bits = 5;\r
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);\r
+\r
+        /* do this just once */\r
+        virgin = 0;\r
+    }\r
+#else /* !BUILDFIXED */\r
+#   include "inffixed.h"\r
+#endif /* BUILDFIXED */\r
+    state->lencode = lenfix;\r
+    state->lenbits = 9;\r
+    state->distcode = distfix;\r
+    state->distbits = 5;\r
+}\r
+\r
+/* Macros for inflateBack(): */\r
+\r
+/* Load returned state from inflate_fast() */\r
+#define LOAD() \\r
+    do { \\r
+        put = strm->next_out; \\r
+        left = strm->avail_out; \\r
+        next = strm->next_in; \\r
+        have = strm->avail_in; \\r
+        hold = state->hold; \\r
+        bits = state->bits; \\r
+    } while (0)\r
+\r
+/* Set state from registers for inflate_fast() */\r
+#define RESTORE() \\r
+    do { \\r
+        strm->next_out = put; \\r
+        strm->avail_out = left; \\r
+        strm->next_in = next; \\r
+        strm->avail_in = have; \\r
+        state->hold = hold; \\r
+        state->bits = bits; \\r
+    } while (0)\r
+\r
+/* Clear the input bit accumulator */\r
+#define INITBITS() \\r
+    do { \\r
+        hold = 0; \\r
+        bits = 0; \\r
+    } while (0)\r
+\r
+/* Assure that some input is available.  If input is requested, but denied,\r
+   then return a Z_BUF_ERROR from inflateBack(). */\r
+#define PULL() \\r
+    do { \\r
+        if (have == 0) { \\r
+            have = in(in_desc, &next); \\r
+            if (have == 0) { \\r
+                next = Z_NULL; \\r
+                ret = Z_BUF_ERROR; \\r
+                goto inf_leave; \\r
+            } \\r
+        } \\r
+    } while (0)\r
+\r
+/* Get a byte of input into the bit accumulator, or return from inflateBack()\r
+   with an error if there is no input available. */\r
+#define PULLBYTE() \\r
+    do { \\r
+        PULL(); \\r
+        have--; \\r
+        hold += (unsigned long)(*next++) << bits; \\r
+        bits += 8; \\r
+    } while (0)\r
+\r
+/* Assure that there are at least n bits in the bit accumulator.  If there is\r
+   not enough available input to do that, then return from inflateBack() with\r
+   an error. */\r
+#define NEEDBITS(n) \\r
+    do { \\r
+        while (bits < (unsigned)(n)) \\r
+            PULLBYTE(); \\r
+    } while (0)\r
+\r
+/* Return the low n bits of the bit accumulator (n < 16) */\r
+#define BITS(n) \\r
+    ((unsigned)hold & ((1U << (n)) - 1))\r
+\r
+/* Remove n bits from the bit accumulator */\r
+#define DROPBITS(n) \\r
+    do { \\r
+        hold >>= (n); \\r
+        bits -= (unsigned)(n); \\r
+    } while (0)\r
+\r
+/* Remove zero to seven bits as needed to go to a byte boundary */\r
+#define BYTEBITS() \\r
+    do { \\r
+        hold >>= bits & 7; \\r
+        bits -= bits & 7; \\r
+    } while (0)\r
+\r
+/* Assure that some output space is available, by writing out the window\r
+   if it's full.  If the write fails, return from inflateBack() with a\r
+   Z_BUF_ERROR. */\r
+#define ROOM() \\r
+    do { \\r
+        if (left == 0) { \\r
+            put = state->window; \\r
+            left = state->wsize; \\r
+            state->whave = left; \\r
+            if (out(out_desc, put, left)) { \\r
+                ret = Z_BUF_ERROR; \\r
+                goto inf_leave; \\r
+            } \\r
+        } \\r
+    } while (0)\r
+\r
+/*\r
+   strm provides the memory allocation functions and window buffer on input,\r
+   and provides information on the unused input on return.  For Z_DATA_ERROR\r
+   returns, strm will also provide an error message.\r
+\r
+   in() and out() are the call-back input and output functions.  When\r
+   inflateBack() needs more input, it calls in().  When inflateBack() has\r
+   filled the window with output, or when it completes with data in the\r
+   window, it calls out() to write out the data.  The application must not\r
+   change the provided input until in() is called again or inflateBack()\r
+   returns.  The application must not change the window/output buffer until\r
+   inflateBack() returns.\r
+\r
+   in() and out() are called with a descriptor parameter provided in the\r
+   inflateBack() call.  This parameter can be a structure that provides the\r
+   information required to do the read or write, as well as accumulated\r
+   information on the input and output such as totals and check values.\r
+\r
+   in() should return zero on failure.  out() should return non-zero on\r
+   failure.  If either in() or out() fails, than inflateBack() returns a\r
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it\r
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()\r
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format\r
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.\r
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters\r
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.\r
+ */\r
+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)\r
+z_streamp strm;\r
+in_func in;\r
+void FAR *in_desc;\r
+out_func out;\r
+void FAR *out_desc;\r
+{\r
+    struct inflate_state FAR *state;\r
+    unsigned char FAR *next;    /* next input */\r
+    unsigned char FAR *put;     /* next output */\r
+    unsigned have, left;        /* available input and output */\r
+    unsigned long hold;         /* bit buffer */\r
+    unsigned bits;              /* bits in bit buffer */\r
+    unsigned copy;              /* number of stored or match bytes to copy */\r
+    unsigned char FAR *from;    /* where to copy match bytes from */\r
+    code here;                  /* current decoding table entry */\r
+    code last;                  /* parent table entry */\r
+    unsigned len;               /* length to copy for repeats, bits to drop */\r
+    int ret;                    /* return code */\r
+    static const unsigned short order[19] = /* permutation of code lengths */\r
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};\r
+\r
+    /* Check that the strm exists and that the state was initialized */\r
+    if (strm == Z_NULL || strm->state == Z_NULL)\r
+        return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+\r
+    /* Reset the state */\r
+    strm->msg = Z_NULL;\r
+    state->mode = TYPE;\r
+    state->last = 0;\r
+    state->whave = 0;\r
+    next = strm->next_in;\r
+    have = next != Z_NULL ? strm->avail_in : 0;\r
+    hold = 0;\r
+    bits = 0;\r
+    put = state->window;\r
+    left = state->wsize;\r
+\r
+    /* Inflate until end of block marked as last */\r
+    for (;;)\r
+        switch (state->mode) {\r
+        case TYPE:\r
+            /* determine and dispatch block type */\r
+            if (state->last) {\r
+                BYTEBITS();\r
+                state->mode = DONE;\r
+                break;\r
+            }\r
+            NEEDBITS(3);\r
+            state->last = BITS(1);\r
+            DROPBITS(1);\r
+            switch (BITS(2)) {\r
+            case 0:                             /* stored block */\r
+                Tracev((stderr, "inflate:     stored block%s\n",\r
+                        state->last ? " (last)" : ""));\r
+                state->mode = STORED;\r
+                break;\r
+            case 1:                             /* fixed block */\r
+                fixedtables(state);\r
+                Tracev((stderr, "inflate:     fixed codes block%s\n",\r
+                        state->last ? " (last)" : ""));\r
+                state->mode = LEN;              /* decode codes */\r
+                break;\r
+            case 2:                             /* dynamic block */\r
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",\r
+                        state->last ? " (last)" : ""));\r
+                state->mode = TABLE;\r
+                break;\r
+            case 3:\r
+                strm->msg = (char *)"invalid block type";\r
+                state->mode = BAD;\r
+            }\r
+            DROPBITS(2);\r
+            break;\r
+\r
+        case STORED:\r
+            /* get and verify stored block length */\r
+            BYTEBITS();                         /* go to byte boundary */\r
+            NEEDBITS(32);\r
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {\r
+                strm->msg = (char *)"invalid stored block lengths";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            state->length = (unsigned)hold & 0xffff;\r
+            Tracev((stderr, "inflate:       stored length %u\n",\r
+                    state->length));\r
+            INITBITS();\r
+\r
+            /* copy stored block from input to output */\r
+            while (state->length != 0) {\r
+                copy = state->length;\r
+                PULL();\r
+                ROOM();\r
+                if (copy > have) copy = have;\r
+                if (copy > left) copy = left;\r
+                zmemcpy(put, next, copy);\r
+                have -= copy;\r
+                next += copy;\r
+                left -= copy;\r
+                put += copy;\r
+                state->length -= copy;\r
+            }\r
+            Tracev((stderr, "inflate:       stored end\n"));\r
+            state->mode = TYPE;\r
+            break;\r
+\r
+        case TABLE:\r
+            /* get dynamic table entries descriptor */\r
+            NEEDBITS(14);\r
+            state->nlen = BITS(5) + 257;\r
+            DROPBITS(5);\r
+            state->ndist = BITS(5) + 1;\r
+            DROPBITS(5);\r
+            state->ncode = BITS(4) + 4;\r
+            DROPBITS(4);\r
+#ifndef PKZIP_BUG_WORKAROUND\r
+            if (state->nlen > 286 || state->ndist > 30) {\r
+                strm->msg = (char *)"too many length or distance symbols";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+#endif\r
+            Tracev((stderr, "inflate:       table sizes ok\n"));\r
+\r
+            /* get code length code lengths (not a typo) */\r
+            state->have = 0;\r
+            while (state->have < state->ncode) {\r
+                NEEDBITS(3);\r
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);\r
+                DROPBITS(3);\r
+            }\r
+            while (state->have < 19)\r
+                state->lens[order[state->have++]] = 0;\r
+            state->next = state->codes;\r
+            state->lencode = (code const FAR *)(state->next);\r
+            state->lenbits = 7;\r
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),\r
+                                &(state->lenbits), state->work);\r
+            if (ret) {\r
+                strm->msg = (char *)"invalid code lengths set";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            Tracev((stderr, "inflate:       code lengths ok\n"));\r
+\r
+            /* get length and distance code code lengths */\r
+            state->have = 0;\r
+            while (state->have < state->nlen + state->ndist) {\r
+                for (;;) {\r
+                    here = state->lencode[BITS(state->lenbits)];\r
+                    if ((unsigned)(here.bits) <= bits) break;\r
+                    PULLBYTE();\r
+                }\r
+                if (here.val < 16) {\r
+                    NEEDBITS(here.bits);\r
+                    DROPBITS(here.bits);\r
+                    state->lens[state->have++] = here.val;\r
+                }\r
+                else {\r
+                    if (here.val == 16) {\r
+                        NEEDBITS(here.bits + 2);\r
+                        DROPBITS(here.bits);\r
+                        if (state->have == 0) {\r
+                            strm->msg = (char *)"invalid bit length repeat";\r
+                            state->mode = BAD;\r
+                            break;\r
+                        }\r
+                        len = (unsigned)(state->lens[state->have - 1]);\r
+                        copy = 3 + BITS(2);\r
+                        DROPBITS(2);\r
+                    }\r
+                    else if (here.val == 17) {\r
+                        NEEDBITS(here.bits + 3);\r
+                        DROPBITS(here.bits);\r
+                        len = 0;\r
+                        copy = 3 + BITS(3);\r
+                        DROPBITS(3);\r
+                    }\r
+                    else {\r
+                        NEEDBITS(here.bits + 7);\r
+                        DROPBITS(here.bits);\r
+                        len = 0;\r
+                        copy = 11 + BITS(7);\r
+                        DROPBITS(7);\r
+                    }\r
+                    if (state->have + copy > state->nlen + state->ndist) {\r
+                        strm->msg = (char *)"invalid bit length repeat";\r
+                        state->mode = BAD;\r
+                        break;\r
+                    }\r
+                    while (copy--)\r
+                        state->lens[state->have++] = (unsigned short)len;\r
+                }\r
+            }\r
+\r
+            /* handle error breaks in while */\r
+            if (state->mode == BAD) break;\r
+\r
+            /* check for end-of-block code (better have one) */\r
+            if (state->lens[256] == 0) {\r
+                strm->msg = (char *)"invalid code -- missing end-of-block";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+\r
+            /* build code tables -- note: do not change the lenbits or distbits\r
+               values here (9 and 6) without reading the comments in inftrees.h\r
+               concerning the ENOUGH constants, which depend on those values */\r
+            state->next = state->codes;\r
+            state->lencode = (code const FAR *)(state->next);\r
+            state->lenbits = 9;\r
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),\r
+                                &(state->lenbits), state->work);\r
+            if (ret) {\r
+                strm->msg = (char *)"invalid literal/lengths set";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            state->distcode = (code const FAR *)(state->next);\r
+            state->distbits = 6;\r
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,\r
+                            &(state->next), &(state->distbits), state->work);\r
+            if (ret) {\r
+                strm->msg = (char *)"invalid distances set";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            Tracev((stderr, "inflate:       codes ok\n"));\r
+            state->mode = LEN;\r
+\r
+        case LEN:\r
+            /* use inflate_fast() if we have enough input and output */\r
+            if (have >= 6 && left >= 258) {\r
+                RESTORE();\r
+                if (state->whave < state->wsize)\r
+                    state->whave = state->wsize - left;\r
+                inflate_fast(strm, state->wsize);\r
+                LOAD();\r
+                break;\r
+            }\r
+\r
+            /* get a literal, length, or end-of-block code */\r
+            for (;;) {\r
+                here = state->lencode[BITS(state->lenbits)];\r
+                if ((unsigned)(here.bits) <= bits) break;\r
+                PULLBYTE();\r
+            }\r
+            if (here.op && (here.op & 0xf0) == 0) {\r
+                last = here;\r
+                for (;;) {\r
+                    here = state->lencode[last.val +\r
+                            (BITS(last.bits + last.op) >> last.bits)];\r
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;\r
+                    PULLBYTE();\r
+                }\r
+                DROPBITS(last.bits);\r
+            }\r
+            DROPBITS(here.bits);\r
+            state->length = (unsigned)here.val;\r
+\r
+            /* process literal */\r
+            if (here.op == 0) {\r
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?\r
+                        "inflate:         literal '%c'\n" :\r
+                        "inflate:         literal 0x%02x\n", here.val));\r
+                ROOM();\r
+                *put++ = (unsigned char)(state->length);\r
+                left--;\r
+                state->mode = LEN;\r
+                break;\r
+            }\r
+\r
+            /* process end of block */\r
+            if (here.op & 32) {\r
+                Tracevv((stderr, "inflate:         end of block\n"));\r
+                state->mode = TYPE;\r
+                break;\r
+            }\r
+\r
+            /* invalid code */\r
+            if (here.op & 64) {\r
+                strm->msg = (char *)"invalid literal/length code";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+\r
+            /* length code -- get extra bits, if any */\r
+            state->extra = (unsigned)(here.op) & 15;\r
+            if (state->extra != 0) {\r
+                NEEDBITS(state->extra);\r
+                state->length += BITS(state->extra);\r
+                DROPBITS(state->extra);\r
+            }\r
+            Tracevv((stderr, "inflate:         length %u\n", state->length));\r
+\r
+            /* get distance code */\r
+            for (;;) {\r
+                here = state->distcode[BITS(state->distbits)];\r
+                if ((unsigned)(here.bits) <= bits) break;\r
+                PULLBYTE();\r
+            }\r
+            if ((here.op & 0xf0) == 0) {\r
+                last = here;\r
+                for (;;) {\r
+                    here = state->distcode[last.val +\r
+                            (BITS(last.bits + last.op) >> last.bits)];\r
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;\r
+                    PULLBYTE();\r
+                }\r
+                DROPBITS(last.bits);\r
+            }\r
+            DROPBITS(here.bits);\r
+            if (here.op & 64) {\r
+                strm->msg = (char *)"invalid distance code";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            state->offset = (unsigned)here.val;\r
+\r
+            /* get distance extra bits, if any */\r
+            state->extra = (unsigned)(here.op) & 15;\r
+            if (state->extra != 0) {\r
+                NEEDBITS(state->extra);\r
+                state->offset += BITS(state->extra);\r
+                DROPBITS(state->extra);\r
+            }\r
+            if (state->offset > state->wsize - (state->whave < state->wsize ?\r
+                                                left : 0)) {\r
+                strm->msg = (char *)"invalid distance too far back";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));\r
+\r
+            /* copy match from window to output */\r
+            do {\r
+                ROOM();\r
+                copy = state->wsize - state->offset;\r
+                if (copy < left) {\r
+                    from = put + copy;\r
+                    copy = left - copy;\r
+                }\r
+                else {\r
+                    from = put - state->offset;\r
+                    copy = left;\r
+                }\r
+                if (copy > state->length) copy = state->length;\r
+                state->length -= copy;\r
+                left -= copy;\r
+                do {\r
+                    *put++ = *from++;\r
+                } while (--copy);\r
+            } while (state->length != 0);\r
+            break;\r
+\r
+        case DONE:\r
+            /* inflate stream terminated properly -- write leftover output */\r
+            ret = Z_STREAM_END;\r
+            if (left < state->wsize) {\r
+                if (out(out_desc, state->window, state->wsize - left))\r
+                    ret = Z_BUF_ERROR;\r
+            }\r
+            goto inf_leave;\r
+\r
+        case BAD:\r
+            ret = Z_DATA_ERROR;\r
+            goto inf_leave;\r
+\r
+        default:                /* can't happen, but makes compilers happy */\r
+            ret = Z_STREAM_ERROR;\r
+            goto inf_leave;\r
+        }\r
+\r
+    /* Return unused input */\r
+  inf_leave:\r
+    strm->next_in = next;\r
+    strm->avail_in = have;\r
+    return ret;\r
+}\r
+\r
+int ZEXPORT inflateBackEnd(strm)\r
+z_streamp strm;\r
+{\r
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)\r
+        return Z_STREAM_ERROR;\r
+    ZFREE(strm, strm->state);\r
+    strm->state = Z_NULL;\r
+    Tracev((stderr, "inflate: end\n"));\r
+    return Z_OK;\r
+}\r
diff --git a/win32port/zlib/inffast.c b/win32port/zlib/inffast.c
new file mode 100644 (file)
index 0000000..2dfd412
--- /dev/null
@@ -0,0 +1,340 @@
+/* inffast.c -- fast decoding\r
+ * Copyright (C) 1995-2008, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+#include "zutil.h"\r
+#include "inftrees.h"\r
+#include "inflate.h"\r
+#include "inffast.h"\r
+\r
+#ifndef ASMINF\r
+\r
+/* Allow machine dependent optimization for post-increment or pre-increment.\r
+   Based on testing to date,\r
+   Pre-increment preferred for:\r
+   - PowerPC G3 (Adler)\r
+   - MIPS R5000 (Randers-Pehrson)\r
+   Post-increment preferred for:\r
+   - none\r
+   No measurable difference:\r
+   - Pentium III (Anderson)\r
+   - M68060 (Nikl)\r
+ */\r
+#ifdef POSTINC\r
+#  define OFF 0\r
+#  define PUP(a) *(a)++\r
+#else\r
+#  define OFF 1\r
+#  define PUP(a) *++(a)\r
+#endif\r
+\r
+/*\r
+   Decode literal, length, and distance codes and write out the resulting\r
+   literal and match bytes until either not enough input or output is\r
+   available, an end-of-block is encountered, or a data error is encountered.\r
+   When large enough input and output buffers are supplied to inflate(), for\r
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the\r
+   inflate execution time is spent in this routine.\r
+\r
+   Entry assumptions:\r
+\r
+        state->mode == LEN\r
+        strm->avail_in >= 6\r
+        strm->avail_out >= 258\r
+        start >= strm->avail_out\r
+        state->bits < 8\r
+\r
+   On return, state->mode is one of:\r
+\r
+        LEN -- ran out of enough output space or enough available input\r
+        TYPE -- reached end of block code, inflate() to interpret next block\r
+        BAD -- error in block data\r
+\r
+   Notes:\r
+\r
+    - The maximum input bits used by a length/distance pair is 15 bits for the\r
+      length code, 5 bits for the length extra, 15 bits for the distance code,\r
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.\r
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid\r
+      checking for available input while decoding.\r
+\r
+    - The maximum bytes that a single length/distance pair can output is 258\r
+      bytes, which is the maximum length that can be coded.  inflate_fast()\r
+      requires strm->avail_out >= 258 for each loop to avoid checking for\r
+      output space.\r
+ */\r
+void ZLIB_INTERNAL inflate_fast(strm, start)\r
+z_streamp strm;\r
+unsigned start;         /* inflate()'s starting value for strm->avail_out */\r
+{\r
+    struct inflate_state FAR *state;\r
+    unsigned char FAR *in;      /* local strm->next_in */\r
+    unsigned char FAR *last;    /* while in < last, enough input available */\r
+    unsigned char FAR *out;     /* local strm->next_out */\r
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */\r
+    unsigned char FAR *end;     /* while out < end, enough space available */\r
+#ifdef INFLATE_STRICT\r
+    unsigned dmax;              /* maximum distance from zlib header */\r
+#endif\r
+    unsigned wsize;             /* window size or zero if not using window */\r
+    unsigned whave;             /* valid bytes in the window */\r
+    unsigned wnext;             /* window write index */\r
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */\r
+    unsigned long hold;         /* local strm->hold */\r
+    unsigned bits;              /* local strm->bits */\r
+    code const FAR *lcode;      /* local strm->lencode */\r
+    code const FAR *dcode;      /* local strm->distcode */\r
+    unsigned lmask;             /* mask for first level of length codes */\r
+    unsigned dmask;             /* mask for first level of distance codes */\r
+    code here;                  /* retrieved table entry */\r
+    unsigned op;                /* code bits, operation, extra bits, or */\r
+                                /*  window position, window bytes to copy */\r
+    unsigned len;               /* match length, unused bytes */\r
+    unsigned dist;              /* match distance */\r
+    unsigned char FAR *from;    /* where to copy match from */\r
+\r
+    /* copy state to local variables */\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    in = strm->next_in - OFF;\r
+    last = in + (strm->avail_in - 5);\r
+    out = strm->next_out - OFF;\r
+    beg = out - (start - strm->avail_out);\r
+    end = out + (strm->avail_out - 257);\r
+#ifdef INFLATE_STRICT\r
+    dmax = state->dmax;\r
+#endif\r
+    wsize = state->wsize;\r
+    whave = state->whave;\r
+    wnext = state->wnext;\r
+    window = state->window;\r
+    hold = state->hold;\r
+    bits = state->bits;\r
+    lcode = state->lencode;\r
+    dcode = state->distcode;\r
+    lmask = (1U << state->lenbits) - 1;\r
+    dmask = (1U << state->distbits) - 1;\r
+\r
+    /* decode literals and length/distances until end-of-block or not enough\r
+       input data or output space */\r
+    do {\r
+        if (bits < 15) {\r
+            hold += (unsigned long)(PUP(in)) << bits;\r
+            bits += 8;\r
+            hold += (unsigned long)(PUP(in)) << bits;\r
+            bits += 8;\r
+        }\r
+        here = lcode[hold & lmask];\r
+      dolen:\r
+        op = (unsigned)(here.bits);\r
+        hold >>= op;\r
+        bits -= op;\r
+        op = (unsigned)(here.op);\r
+        if (op == 0) {                          /* literal */\r
+            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?\r
+                    "inflate:         literal '%c'\n" :\r
+                    "inflate:         literal 0x%02x\n", here.val));\r
+            PUP(out) = (unsigned char)(here.val);\r
+        }\r
+        else if (op & 16) {                     /* length base */\r
+            len = (unsigned)(here.val);\r
+            op &= 15;                           /* number of extra bits */\r
+            if (op) {\r
+                if (bits < op) {\r
+                    hold += (unsigned long)(PUP(in)) << bits;\r
+                    bits += 8;\r
+                }\r
+                len += (unsigned)hold & ((1U << op) - 1);\r
+                hold >>= op;\r
+                bits -= op;\r
+            }\r
+            Tracevv((stderr, "inflate:         length %u\n", len));\r
+            if (bits < 15) {\r
+                hold += (unsigned long)(PUP(in)) << bits;\r
+                bits += 8;\r
+                hold += (unsigned long)(PUP(in)) << bits;\r
+                bits += 8;\r
+            }\r
+            here = dcode[hold & dmask];\r
+          dodist:\r
+            op = (unsigned)(here.bits);\r
+            hold >>= op;\r
+            bits -= op;\r
+            op = (unsigned)(here.op);\r
+            if (op & 16) {                      /* distance base */\r
+                dist = (unsigned)(here.val);\r
+                op &= 15;                       /* number of extra bits */\r
+                if (bits < op) {\r
+                    hold += (unsigned long)(PUP(in)) << bits;\r
+                    bits += 8;\r
+                    if (bits < op) {\r
+                        hold += (unsigned long)(PUP(in)) << bits;\r
+                        bits += 8;\r
+                    }\r
+                }\r
+                dist += (unsigned)hold & ((1U << op) - 1);\r
+#ifdef INFLATE_STRICT\r
+                if (dist > dmax) {\r
+                    strm->msg = (char *)"invalid distance too far back";\r
+                    state->mode = BAD;\r
+                    break;\r
+                }\r
+#endif\r
+                hold >>= op;\r
+                bits -= op;\r
+                Tracevv((stderr, "inflate:         distance %u\n", dist));\r
+                op = (unsigned)(out - beg);     /* max distance in output */\r
+                if (dist > op) {                /* see if copy from window */\r
+                    op = dist - op;             /* distance back in window */\r
+                    if (op > whave) {\r
+                        if (state->sane) {\r
+                            strm->msg =\r
+                                (char *)"invalid distance too far back";\r
+                            state->mode = BAD;\r
+                            break;\r
+                        }\r
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR\r
+                        if (len <= op - whave) {\r
+                            do {\r
+                                PUP(out) = 0;\r
+                            } while (--len);\r
+                            continue;\r
+                        }\r
+                        len -= op - whave;\r
+                        do {\r
+                            PUP(out) = 0;\r
+                        } while (--op > whave);\r
+                        if (op == 0) {\r
+                            from = out - dist;\r
+                            do {\r
+                                PUP(out) = PUP(from);\r
+                            } while (--len);\r
+                            continue;\r
+                        }\r
+#endif\r
+                    }\r
+                    from = window - OFF;\r
+                    if (wnext == 0) {           /* very common case */\r
+                        from += wsize - op;\r
+                        if (op < len) {         /* some from window */\r
+                            len -= op;\r
+                            do {\r
+                                PUP(out) = PUP(from);\r
+                            } while (--op);\r
+                            from = out - dist;  /* rest from output */\r
+                        }\r
+                    }\r
+                    else if (wnext < op) {      /* wrap around window */\r
+                        from += wsize + wnext - op;\r
+                        op -= wnext;\r
+                        if (op < len) {         /* some from end of window */\r
+                            len -= op;\r
+                            do {\r
+                                PUP(out) = PUP(from);\r
+                            } while (--op);\r
+                            from = window - OFF;\r
+                            if (wnext < len) {  /* some from start of window */\r
+                                op = wnext;\r
+                                len -= op;\r
+                                do {\r
+                                    PUP(out) = PUP(from);\r
+                                } while (--op);\r
+                                from = out - dist;      /* rest from output */\r
+                            }\r
+                        }\r
+                    }\r
+                    else {                      /* contiguous in window */\r
+                        from += wnext - op;\r
+                        if (op < len) {         /* some from window */\r
+                            len -= op;\r
+                            do {\r
+                                PUP(out) = PUP(from);\r
+                            } while (--op);\r
+                            from = out - dist;  /* rest from output */\r
+                        }\r
+                    }\r
+                    while (len > 2) {\r
+                        PUP(out) = PUP(from);\r
+                        PUP(out) = PUP(from);\r
+                        PUP(out) = PUP(from);\r
+                        len -= 3;\r
+                    }\r
+                    if (len) {\r
+                        PUP(out) = PUP(from);\r
+                        if (len > 1)\r
+                            PUP(out) = PUP(from);\r
+                    }\r
+                }\r
+                else {\r
+                    from = out - dist;          /* copy direct from output */\r
+                    do {                        /* minimum length is three */\r
+                        PUP(out) = PUP(from);\r
+                        PUP(out) = PUP(from);\r
+                        PUP(out) = PUP(from);\r
+                        len -= 3;\r
+                    } while (len > 2);\r
+                    if (len) {\r
+                        PUP(out) = PUP(from);\r
+                        if (len > 1)\r
+                            PUP(out) = PUP(from);\r
+                    }\r
+                }\r
+            }\r
+            else if ((op & 64) == 0) {          /* 2nd level distance code */\r
+                here = dcode[here.val + (hold & ((1U << op) - 1))];\r
+                goto dodist;\r
+            }\r
+            else {\r
+                strm->msg = (char *)"invalid distance code";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+        }\r
+        else if ((op & 64) == 0) {              /* 2nd level length code */\r
+            here = lcode[here.val + (hold & ((1U << op) - 1))];\r
+            goto dolen;\r
+        }\r
+        else if (op & 32) {                     /* end-of-block */\r
+            Tracevv((stderr, "inflate:         end of block\n"));\r
+            state->mode = TYPE;\r
+            break;\r
+        }\r
+        else {\r
+            strm->msg = (char *)"invalid literal/length code";\r
+            state->mode = BAD;\r
+            break;\r
+        }\r
+    } while (in < last && out < end);\r
+\r
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */\r
+    len = bits >> 3;\r
+    in -= len;\r
+    bits -= len << 3;\r
+    hold &= (1U << bits) - 1;\r
+\r
+    /* update state and return */\r
+    strm->next_in = in + OFF;\r
+    strm->next_out = out + OFF;\r
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));\r
+    strm->avail_out = (unsigned)(out < end ?\r
+                                 257 + (end - out) : 257 - (out - end));\r
+    state->hold = hold;\r
+    state->bits = bits;\r
+    return;\r
+}\r
+\r
+/*\r
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):\r
+   - Using bit fields for code structure\r
+   - Different op definition to avoid & for extra bits (do & for table bits)\r
+   - Three separate decoding do-loops for direct, window, and wnext == 0\r
+   - Special case for distance > 1 copies to do overlapped load and store copy\r
+   - Explicit branch predictions (based on measured branch probabilities)\r
+   - Deferring match copy and interspersed it with decoding subsequent codes\r
+   - Swapping literal/length else\r
+   - Swapping window/direct else\r
+   - Larger unrolled copy loops (three is about right)\r
+   - Moving len -= 3 statement into middle of loop\r
+ */\r
+\r
+#endif /* !ASMINF */\r
diff --git a/win32port/zlib/inffast.h b/win32port/zlib/inffast.h
new file mode 100644 (file)
index 0000000..e1e6db4
--- /dev/null
@@ -0,0 +1,11 @@
+/* inffast.h -- header to use inffast.c\r
+ * Copyright (C) 1995-2003, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* WARNING: this file should *not* be used by applications. It is\r
+   part of the implementation of the compression library and is\r
+   subject to change. Applications should only use zlib.h.\r
+ */\r
+\r
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));\r
diff --git a/win32port/zlib/inffixed.h b/win32port/zlib/inffixed.h
new file mode 100644 (file)
index 0000000..423d5c5
--- /dev/null
@@ -0,0 +1,94 @@
+    /* inffixed.h -- table for decoding fixed codes\r
+     * Generated automatically by makefixed().\r
+     */\r
+\r
+    /* WARNING: this file should *not* be used by applications. It\r
+       is part of the implementation of the compression library and\r
+       is subject to change. Applications should only use zlib.h.\r
+     */\r
+\r
+    static const code lenfix[512] = {\r
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},\r
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},\r
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},\r
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},\r
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},\r
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},\r
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},\r
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},\r
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},\r
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},\r
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},\r
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},\r
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},\r
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},\r
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},\r
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},\r
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},\r
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},\r
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},\r
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},\r
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},\r
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},\r
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},\r
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},\r
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},\r
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},\r
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},\r
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},\r
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},\r
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},\r
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},\r
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},\r
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},\r
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},\r
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},\r
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},\r
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},\r
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},\r
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},\r
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},\r
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},\r
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},\r
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},\r
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},\r
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},\r
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},\r
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},\r
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},\r
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},\r
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},\r
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},\r
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},\r
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},\r
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},\r
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},\r
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},\r
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},\r
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},\r
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},\r
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},\r
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},\r
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},\r
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},\r
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},\r
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},\r
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},\r
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},\r
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},\r
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},\r
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},\r
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},\r
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},\r
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},\r
+        {0,9,255}\r
+    };\r
+\r
+    static const code distfix[32] = {\r
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},\r
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},\r
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},\r
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},\r
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},\r
+        {22,5,193},{64,5,0}\r
+    };\r
diff --git a/win32port/zlib/inflate.c b/win32port/zlib/inflate.c
new file mode 100644 (file)
index 0000000..5bec31e
--- /dev/null
@@ -0,0 +1,1480 @@
+/* inflate.c -- zlib decompression\r
+ * Copyright (C) 1995-2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/*\r
+ * Change history:\r
+ *\r
+ * 1.2.beta0    24 Nov 2002\r
+ * - First version -- complete rewrite of inflate to simplify code, avoid\r
+ *   creation of window when not needed, minimize use of window when it is\r
+ *   needed, make inffast.c even faster, implement gzip decoding, and to\r
+ *   improve code readability and style over the previous zlib inflate code\r
+ *\r
+ * 1.2.beta1    25 Nov 2002\r
+ * - Use pointers for available input and output checking in inffast.c\r
+ * - Remove input and output counters in inffast.c\r
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6\r
+ * - Remove unnecessary second byte pull from length extra in inffast.c\r
+ * - Unroll direct copy to three copies per loop in inffast.c\r
+ *\r
+ * 1.2.beta2    4 Dec 2002\r
+ * - Change external routine names to reduce potential conflicts\r
+ * - Correct filename to inffixed.h for fixed tables in inflate.c\r
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c\r
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)\r
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c\r
+ *\r
+ * 1.2.beta3    22 Dec 2002\r
+ * - Add comments on state->bits assertion in inffast.c\r
+ * - Add comments on op field in inftrees.h\r
+ * - Fix bug in reuse of allocated window after inflateReset()\r
+ * - Remove bit fields--back to byte structure for speed\r
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths\r
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?\r
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)\r
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used\r
+ * - Use local copies of stream next and avail values, as well as local bit\r
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used\r
+ *\r
+ * 1.2.beta4    1 Jan 2003\r
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings\r
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c\r
+ * - Add comments in inffast.c to introduce the inflate_fast() routine\r
+ * - Rearrange window copies in inflate_fast() for speed and simplification\r
+ * - Unroll last copy for window match in inflate_fast()\r
+ * - Use local copies of window variables in inflate_fast() for speed\r
+ * - Pull out common wnext == 0 case for speed in inflate_fast()\r
+ * - Make op and len in inflate_fast() unsigned for consistency\r
+ * - Add FAR to lcode and dcode declarations in inflate_fast()\r
+ * - Simplified bad distance check in inflate_fast()\r
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new\r
+ *   source file infback.c to provide a call-back interface to inflate for\r
+ *   programs like gzip and unzip -- uses window as output buffer to avoid\r
+ *   window copying\r
+ *\r
+ * 1.2.beta5    1 Jan 2003\r
+ * - Improved inflateBack() interface to allow the caller to provide initial\r
+ *   input in strm.\r
+ * - Fixed stored blocks bug in inflateBack()\r
+ *\r
+ * 1.2.beta6    4 Jan 2003\r
+ * - Added comments in inffast.c on effectiveness of POSTINC\r
+ * - Typecasting all around to reduce compiler warnings\r
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to\r
+ *   make compilers happy\r
+ * - Changed type of window in inflateBackInit() to unsigned char *\r
+ *\r
+ * 1.2.beta7    27 Jan 2003\r
+ * - Changed many types to unsigned or unsigned short to avoid warnings\r
+ * - Added inflateCopy() function\r
+ *\r
+ * 1.2.0        9 Mar 2003\r
+ * - Changed inflateBack() interface to provide separate opaque descriptors\r
+ *   for the in() and out() functions\r
+ * - Changed inflateBack() argument and in_func typedef to swap the length\r
+ *   and buffer address return values for the input function\r
+ * - Check next_in and next_out for Z_NULL on entry to inflate()\r
+ *\r
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.\r
+ */\r
+\r
+#include "zutil.h"\r
+#include "inftrees.h"\r
+#include "inflate.h"\r
+#include "inffast.h"\r
+\r
+#ifdef MAKEFIXED\r
+#  ifndef BUILDFIXED\r
+#    define BUILDFIXED\r
+#  endif\r
+#endif\r
+\r
+/* function prototypes */\r
+local void fixedtables OF((struct inflate_state FAR *state));\r
+local int updatewindow OF((z_streamp strm, unsigned out));\r
+#ifdef BUILDFIXED\r
+   void makefixed OF((void));\r
+#endif\r
+local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,\r
+                              unsigned len));\r
+\r
+int ZEXPORT inflateReset(strm)\r
+z_streamp strm;\r
+{\r
+    struct inflate_state FAR *state;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    strm->total_in = strm->total_out = state->total = 0;\r
+    strm->msg = Z_NULL;\r
+    strm->adler = 1;        /* to support ill-conceived Java test suite */\r
+    state->mode = HEAD;\r
+    state->last = 0;\r
+    state->havedict = 0;\r
+    state->dmax = 32768U;\r
+    state->head = Z_NULL;\r
+    state->wsize = 0;\r
+    state->whave = 0;\r
+    state->wnext = 0;\r
+    state->hold = 0;\r
+    state->bits = 0;\r
+    state->lencode = state->distcode = state->next = state->codes;\r
+    state->sane = 1;\r
+    state->back = -1;\r
+    Tracev((stderr, "inflate: reset\n"));\r
+    return Z_OK;\r
+}\r
+\r
+int ZEXPORT inflateReset2(strm, windowBits)\r
+z_streamp strm;\r
+int windowBits;\r
+{\r
+    int wrap;\r
+    struct inflate_state FAR *state;\r
+\r
+    /* get the state */\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+\r
+    /* extract wrap request from windowBits parameter */\r
+    if (windowBits < 0) {\r
+        wrap = 0;\r
+        windowBits = -windowBits;\r
+    }\r
+    else {\r
+        wrap = (windowBits >> 4) + 1;\r
+#ifdef GUNZIP\r
+        if (windowBits < 48)\r
+            windowBits &= 15;\r
+#endif\r
+    }\r
+\r
+    /* set number of window bits, free window if different */\r
+    if (windowBits && (windowBits < 8 || windowBits > 15))\r
+        return Z_STREAM_ERROR;\r
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {\r
+        ZFREE(strm, state->window);\r
+        state->window = Z_NULL;\r
+    }\r
+\r
+    /* update state and reset the rest of it */\r
+    state->wrap = wrap;\r
+    state->wbits = (unsigned)windowBits;\r
+    return inflateReset(strm);\r
+}\r
+\r
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)\r
+z_streamp strm;\r
+int windowBits;\r
+const char *version;\r
+int stream_size;\r
+{\r
+    int ret;\r
+    struct inflate_state FAR *state;\r
+\r
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||\r
+        stream_size != (int)(sizeof(z_stream)))\r
+        return Z_VERSION_ERROR;\r
+    if (strm == Z_NULL) return Z_STREAM_ERROR;\r
+    strm->msg = Z_NULL;                 /* in case we return an error */\r
+    if (strm->zalloc == (alloc_func)0) {\r
+        strm->zalloc = zcalloc;\r
+        strm->opaque = (voidpf)0;\r
+    }\r
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;\r
+    state = (struct inflate_state FAR *)\r
+            ZALLOC(strm, 1, sizeof(struct inflate_state));\r
+    if (state == Z_NULL) return Z_MEM_ERROR;\r
+    Tracev((stderr, "inflate: allocated\n"));\r
+    strm->state = (struct internal_state FAR *)state;\r
+    state->window = Z_NULL;\r
+    ret = inflateReset2(strm, windowBits);\r
+    if (ret != Z_OK) {\r
+        ZFREE(strm, state);\r
+        strm->state = Z_NULL;\r
+    }\r
+    return ret;\r
+}\r
+\r
+int ZEXPORT inflateInit_(strm, version, stream_size)\r
+z_streamp strm;\r
+const char *version;\r
+int stream_size;\r
+{\r
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);\r
+}\r
+\r
+int ZEXPORT inflatePrime(strm, bits, value)\r
+z_streamp strm;\r
+int bits;\r
+int value;\r
+{\r
+    struct inflate_state FAR *state;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    if (bits < 0) {\r
+        state->hold = 0;\r
+        state->bits = 0;\r
+        return Z_OK;\r
+    }\r
+    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;\r
+    value &= (1L << bits) - 1;\r
+    state->hold += value << state->bits;\r
+    state->bits += bits;\r
+    return Z_OK;\r
+}\r
+\r
+/*\r
+   Return state with length and distance decoding tables and index sizes set to\r
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.\r
+   If BUILDFIXED is defined, then instead this routine builds the tables the\r
+   first time it's called, and returns those tables the first time and\r
+   thereafter.  This reduces the size of the code by about 2K bytes, in\r
+   exchange for a little execution time.  However, BUILDFIXED should not be\r
+   used for threaded applications, since the rewriting of the tables and virgin\r
+   may not be thread-safe.\r
+ */\r
+local void fixedtables(state)\r
+struct inflate_state FAR *state;\r
+{\r
+#ifdef BUILDFIXED\r
+    static int virgin = 1;\r
+    static code *lenfix, *distfix;\r
+    static code fixed[544];\r
+\r
+    /* build fixed huffman tables if first call (may not be thread safe) */\r
+    if (virgin) {\r
+        unsigned sym, bits;\r
+        static code *next;\r
+\r
+        /* literal/length table */\r
+        sym = 0;\r
+        while (sym < 144) state->lens[sym++] = 8;\r
+        while (sym < 256) state->lens[sym++] = 9;\r
+        while (sym < 280) state->lens[sym++] = 7;\r
+        while (sym < 288) state->lens[sym++] = 8;\r
+        next = fixed;\r
+        lenfix = next;\r
+        bits = 9;\r
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);\r
+\r
+        /* distance table */\r
+        sym = 0;\r
+        while (sym < 32) state->lens[sym++] = 5;\r
+        distfix = next;\r
+        bits = 5;\r
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);\r
+\r
+        /* do this just once */\r
+        virgin = 0;\r
+    }\r
+#else /* !BUILDFIXED */\r
+#   include "inffixed.h"\r
+#endif /* BUILDFIXED */\r
+    state->lencode = lenfix;\r
+    state->lenbits = 9;\r
+    state->distcode = distfix;\r
+    state->distbits = 5;\r
+}\r
+\r
+#ifdef MAKEFIXED\r
+#include <stdio.h>\r
+\r
+/*\r
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also\r
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes\r
+   those tables to stdout, which would be piped to inffixed.h.  A small program\r
+   can simply call makefixed to do this:\r
+\r
+    void makefixed(void);\r
+\r
+    int main(void)\r
+    {\r
+        makefixed();\r
+        return 0;\r
+    }\r
+\r
+   Then that can be linked with zlib built with MAKEFIXED defined and run:\r
+\r
+    a.out > inffixed.h\r
+ */\r
+void makefixed()\r
+{\r
+    unsigned low, size;\r
+    struct inflate_state state;\r
+\r
+    fixedtables(&state);\r
+    puts("    /* inffixed.h -- table for decoding fixed codes");\r
+    puts("     * Generated automatically by makefixed().");\r
+    puts("     */");\r
+    puts("");\r
+    puts("    /* WARNING: this file should *not* be used by applications.");\r
+    puts("       It is part of the implementation of this library and is");\r
+    puts("       subject to change. Applications should only use zlib.h.");\r
+    puts("     */");\r
+    puts("");\r
+    size = 1U << 9;\r
+    printf("    static const code lenfix[%u] = {", size);\r
+    low = 0;\r
+    for (;;) {\r
+        if ((low % 7) == 0) printf("\n        ");\r
+        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,\r
+               state.lencode[low].val);\r
+        if (++low == size) break;\r
+        putchar(',');\r
+    }\r
+    puts("\n    };");\r
+    size = 1U << 5;\r
+    printf("\n    static const code distfix[%u] = {", size);\r
+    low = 0;\r
+    for (;;) {\r
+        if ((low % 6) == 0) printf("\n        ");\r
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,\r
+               state.distcode[low].val);\r
+        if (++low == size) break;\r
+        putchar(',');\r
+    }\r
+    puts("\n    };");\r
+}\r
+#endif /* MAKEFIXED */\r
+\r
+/*\r
+   Update the window with the last wsize (normally 32K) bytes written before\r
+   returning.  If window does not exist yet, create it.  This is only called\r
+   when a window is already in use, or when output has been written during this\r
+   inflate call, but the end of the deflate stream has not been reached yet.\r
+   It is also called to create a window for dictionary data when a dictionary\r
+   is loaded.\r
+\r
+   Providing output buffers larger than 32K to inflate() should provide a speed\r
+   advantage, since only the last 32K of output is copied to the sliding window\r
+   upon return from inflate(), and since all distances after the first 32K of\r
+   output will fall in the output data, making match copies simpler and faster.\r
+   The advantage may be dependent on the size of the processor's data caches.\r
+ */\r
+local int updatewindow(strm, out)\r
+z_streamp strm;\r
+unsigned out;\r
+{\r
+    struct inflate_state FAR *state;\r
+    unsigned copy, dist;\r
+\r
+    state = (struct inflate_state FAR *)strm->state;\r
+\r
+    /* if it hasn't been done already, allocate space for the window */\r
+    if (state->window == Z_NULL) {\r
+        state->window = (unsigned char FAR *)\r
+                        ZALLOC(strm, 1U << state->wbits,\r
+                               sizeof(unsigned char));\r
+        if (state->window == Z_NULL) return 1;\r
+    }\r
+\r
+    /* if window not in use yet, initialize */\r
+    if (state->wsize == 0) {\r
+        state->wsize = 1U << state->wbits;\r
+        state->wnext = 0;\r
+        state->whave = 0;\r
+    }\r
+\r
+    /* copy state->wsize or less output bytes into the circular window */\r
+    copy = out - strm->avail_out;\r
+    if (copy >= state->wsize) {\r
+        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);\r
+        state->wnext = 0;\r
+        state->whave = state->wsize;\r
+    }\r
+    else {\r
+        dist = state->wsize - state->wnext;\r
+        if (dist > copy) dist = copy;\r
+        zmemcpy(state->window + state->wnext, strm->next_out - copy, dist);\r
+        copy -= dist;\r
+        if (copy) {\r
+            zmemcpy(state->window, strm->next_out - copy, copy);\r
+            state->wnext = copy;\r
+            state->whave = state->wsize;\r
+        }\r
+        else {\r
+            state->wnext += dist;\r
+            if (state->wnext == state->wsize) state->wnext = 0;\r
+            if (state->whave < state->wsize) state->whave += dist;\r
+        }\r
+    }\r
+    return 0;\r
+}\r
+\r
+/* Macros for inflate(): */\r
+\r
+/* check function to use adler32() for zlib or crc32() for gzip */\r
+#ifdef GUNZIP\r
+#  define UPDATE(check, buf, len) \\r
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))\r
+#else\r
+#  define UPDATE(check, buf, len) adler32(check, buf, len)\r
+#endif\r
+\r
+/* check macros for header crc */\r
+#ifdef GUNZIP\r
+#  define CRC2(check, word) \\r
+    do { \\r
+        hbuf[0] = (unsigned char)(word); \\r
+        hbuf[1] = (unsigned char)((word) >> 8); \\r
+        check = crc32(check, hbuf, 2); \\r
+    } while (0)\r
+\r
+#  define CRC4(check, word) \\r
+    do { \\r
+        hbuf[0] = (unsigned char)(word); \\r
+        hbuf[1] = (unsigned char)((word) >> 8); \\r
+        hbuf[2] = (unsigned char)((word) >> 16); \\r
+        hbuf[3] = (unsigned char)((word) >> 24); \\r
+        check = crc32(check, hbuf, 4); \\r
+    } while (0)\r
+#endif\r
+\r
+/* Load registers with state in inflate() for speed */\r
+#define LOAD() \\r
+    do { \\r
+        put = strm->next_out; \\r
+        left = strm->avail_out; \\r
+        next = strm->next_in; \\r
+        have = strm->avail_in; \\r
+        hold = state->hold; \\r
+        bits = state->bits; \\r
+    } while (0)\r
+\r
+/* Restore state from registers in inflate() */\r
+#define RESTORE() \\r
+    do { \\r
+        strm->next_out = put; \\r
+        strm->avail_out = left; \\r
+        strm->next_in = next; \\r
+        strm->avail_in = have; \\r
+        state->hold = hold; \\r
+        state->bits = bits; \\r
+    } while (0)\r
+\r
+/* Clear the input bit accumulator */\r
+#define INITBITS() \\r
+    do { \\r
+        hold = 0; \\r
+        bits = 0; \\r
+    } while (0)\r
+\r
+/* Get a byte of input into the bit accumulator, or return from inflate()\r
+   if there is no input available. */\r
+#define PULLBYTE() \\r
+    do { \\r
+        if (have == 0) goto inf_leave; \\r
+        have--; \\r
+        hold += (unsigned long)(*next++) << bits; \\r
+        bits += 8; \\r
+    } while (0)\r
+\r
+/* Assure that there are at least n bits in the bit accumulator.  If there is\r
+   not enough available input to do that, then return from inflate(). */\r
+#define NEEDBITS(n) \\r
+    do { \\r
+        while (bits < (unsigned)(n)) \\r
+            PULLBYTE(); \\r
+    } while (0)\r
+\r
+/* Return the low n bits of the bit accumulator (n < 16) */\r
+#define BITS(n) \\r
+    ((unsigned)hold & ((1U << (n)) - 1))\r
+\r
+/* Remove n bits from the bit accumulator */\r
+#define DROPBITS(n) \\r
+    do { \\r
+        hold >>= (n); \\r
+        bits -= (unsigned)(n); \\r
+    } while (0)\r
+\r
+/* Remove zero to seven bits as needed to go to a byte boundary */\r
+#define BYTEBITS() \\r
+    do { \\r
+        hold >>= bits & 7; \\r
+        bits -= bits & 7; \\r
+    } while (0)\r
+\r
+/* Reverse the bytes in a 32-bit value */\r
+#define REVERSE(q) \\r
+    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \\r
+     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))\r
+\r
+/*\r
+   inflate() uses a state machine to process as much input data and generate as\r
+   much output data as possible before returning.  The state machine is\r
+   structured roughly as follows:\r
+\r
+    for (;;) switch (state) {\r
+    ...\r
+    case STATEn:\r
+        if (not enough input data or output space to make progress)\r
+            return;\r
+        ... make progress ...\r
+        state = STATEm;\r
+        break;\r
+    ...\r
+    }\r
+\r
+   so when inflate() is called again, the same case is attempted again, and\r
+   if the appropriate resources are provided, the machine proceeds to the\r
+   next state.  The NEEDBITS() macro is usually the way the state evaluates\r
+   whether it can proceed or should return.  NEEDBITS() does the return if\r
+   the requested bits are not available.  The typical use of the BITS macros\r
+   is:\r
+\r
+        NEEDBITS(n);\r
+        ... do something with BITS(n) ...\r
+        DROPBITS(n);\r
+\r
+   where NEEDBITS(n) either returns from inflate() if there isn't enough\r
+   input left to load n bits into the accumulator, or it continues.  BITS(n)\r
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops\r
+   the low n bits off the accumulator.  INITBITS() clears the accumulator\r
+   and sets the number of available bits to zero.  BYTEBITS() discards just\r
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()\r
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.\r
+\r
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return\r
+   if there is no input available.  The decoding of variable length codes uses\r
+   PULLBYTE() directly in order to pull just enough bytes to decode the next\r
+   code, and no more.\r
+\r
+   Some states loop until they get enough input, making sure that enough\r
+   state information is maintained to continue the loop where it left off\r
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep\r
+   would all have to actually be part of the saved state in case NEEDBITS()\r
+   returns:\r
+\r
+    case STATEw:\r
+        while (want < need) {\r
+            NEEDBITS(n);\r
+            keep[want++] = BITS(n);\r
+            DROPBITS(n);\r
+        }\r
+        state = STATEx;\r
+    case STATEx:\r
+\r
+   As shown above, if the next state is also the next case, then the break\r
+   is omitted.\r
+\r
+   A state may also return if there is not enough output space available to\r
+   complete that state.  Those states are copying stored data, writing a\r
+   literal byte, and copying a matching string.\r
+\r
+   When returning, a "goto inf_leave" is used to update the total counters,\r
+   update the check value, and determine whether any progress has been made\r
+   during that inflate() call in order to return the proper return code.\r
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.\r
+   When there is a window, goto inf_leave will update the window with the last\r
+   output written.  If a goto inf_leave occurs in the middle of decompression\r
+   and there is no window currently, goto inf_leave will create one and copy\r
+   output to the window for the next call of inflate().\r
+\r
+   In this implementation, the flush parameter of inflate() only affects the\r
+   return code (per zlib.h).  inflate() always writes as much as possible to\r
+   strm->next_out, given the space available and the provided input--the effect\r
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers\r
+   the allocation of and copying into a sliding window until necessary, which\r
+   provides the effect documented in zlib.h for Z_FINISH when the entire input\r
+   stream available.  So the only thing the flush parameter actually does is:\r
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it\r
+   will return Z_BUF_ERROR if it has not reached the end of the stream.\r
+ */\r
+\r
+int ZEXPORT inflate(strm, flush)\r
+z_streamp strm;\r
+int flush;\r
+{\r
+    struct inflate_state FAR *state;\r
+    unsigned char FAR *next;    /* next input */\r
+    unsigned char FAR *put;     /* next output */\r
+    unsigned have, left;        /* available input and output */\r
+    unsigned long hold;         /* bit buffer */\r
+    unsigned bits;              /* bits in bit buffer */\r
+    unsigned in, out;           /* save starting available input and output */\r
+    unsigned copy;              /* number of stored or match bytes to copy */\r
+    unsigned char FAR *from;    /* where to copy match bytes from */\r
+    code here;                  /* current decoding table entry */\r
+    code last;                  /* parent table entry */\r
+    unsigned len;               /* length to copy for repeats, bits to drop */\r
+    int ret;                    /* return code */\r
+#ifdef GUNZIP\r
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */\r
+#endif\r
+    static const unsigned short order[19] = /* permutation of code lengths */\r
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||\r
+        (strm->next_in == Z_NULL && strm->avail_in != 0))\r
+        return Z_STREAM_ERROR;\r
+\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */\r
+    LOAD();\r
+    in = have;\r
+    out = left;\r
+    ret = Z_OK;\r
+    for (;;)\r
+        switch (state->mode) {\r
+        case HEAD:\r
+            if (state->wrap == 0) {\r
+                state->mode = TYPEDO;\r
+                break;\r
+            }\r
+            NEEDBITS(16);\r
+#ifdef GUNZIP\r
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */\r
+                state->check = crc32(0L, Z_NULL, 0);\r
+                CRC2(state->check, hold);\r
+                INITBITS();\r
+                state->mode = FLAGS;\r
+                break;\r
+            }\r
+            state->flags = 0;           /* expect zlib header */\r
+            if (state->head != Z_NULL)\r
+                state->head->done = -1;\r
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */\r
+#else\r
+            if (\r
+#endif\r
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {\r
+                strm->msg = (char *)"incorrect header check";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            if (BITS(4) != Z_DEFLATED) {\r
+                strm->msg = (char *)"unknown compression method";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            DROPBITS(4);\r
+            len = BITS(4) + 8;\r
+            if (state->wbits == 0)\r
+                state->wbits = len;\r
+            else if (len > state->wbits) {\r
+                strm->msg = (char *)"invalid window size";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            state->dmax = 1U << len;\r
+            Tracev((stderr, "inflate:   zlib header ok\n"));\r
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);\r
+            state->mode = hold & 0x200 ? DICTID : TYPE;\r
+            INITBITS();\r
+            break;\r
+#ifdef GUNZIP\r
+        case FLAGS:\r
+            NEEDBITS(16);\r
+            state->flags = (int)(hold);\r
+            if ((state->flags & 0xff) != Z_DEFLATED) {\r
+                strm->msg = (char *)"unknown compression method";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            if (state->flags & 0xe000) {\r
+                strm->msg = (char *)"unknown header flags set";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            if (state->head != Z_NULL)\r
+                state->head->text = (int)((hold >> 8) & 1);\r
+            if (state->flags & 0x0200) CRC2(state->check, hold);\r
+            INITBITS();\r
+            state->mode = TIME;\r
+        case TIME:\r
+            NEEDBITS(32);\r
+            if (state->head != Z_NULL)\r
+                state->head->time = hold;\r
+            if (state->flags & 0x0200) CRC4(state->check, hold);\r
+            INITBITS();\r
+            state->mode = OS;\r
+        case OS:\r
+            NEEDBITS(16);\r
+            if (state->head != Z_NULL) {\r
+                state->head->xflags = (int)(hold & 0xff);\r
+                state->head->os = (int)(hold >> 8);\r
+            }\r
+            if (state->flags & 0x0200) CRC2(state->check, hold);\r
+            INITBITS();\r
+            state->mode = EXLEN;\r
+        case EXLEN:\r
+            if (state->flags & 0x0400) {\r
+                NEEDBITS(16);\r
+                state->length = (unsigned)(hold);\r
+                if (state->head != Z_NULL)\r
+                    state->head->extra_len = (unsigned)hold;\r
+                if (state->flags & 0x0200) CRC2(state->check, hold);\r
+                INITBITS();\r
+            }\r
+            else if (state->head != Z_NULL)\r
+                state->head->extra = Z_NULL;\r
+            state->mode = EXTRA;\r
+        case EXTRA:\r
+            if (state->flags & 0x0400) {\r
+                copy = state->length;\r
+                if (copy > have) copy = have;\r
+                if (copy) {\r
+                    if (state->head != Z_NULL &&\r
+                        state->head->extra != Z_NULL) {\r
+                        len = state->head->extra_len - state->length;\r
+                        zmemcpy(state->head->extra + len, next,\r
+                                len + copy > state->head->extra_max ?\r
+                                state->head->extra_max - len : copy);\r
+                    }\r
+                    if (state->flags & 0x0200)\r
+                        state->check = crc32(state->check, next, copy);\r
+                    have -= copy;\r
+                    next += copy;\r
+                    state->length -= copy;\r
+                }\r
+                if (state->length) goto inf_leave;\r
+            }\r
+            state->length = 0;\r
+            state->mode = NAME;\r
+        case NAME:\r
+            if (state->flags & 0x0800) {\r
+                if (have == 0) goto inf_leave;\r
+                copy = 0;\r
+                do {\r
+                    len = (unsigned)(next[copy++]);\r
+                    if (state->head != Z_NULL &&\r
+                            state->head->name != Z_NULL &&\r
+                            state->length < state->head->name_max)\r
+                        state->head->name[state->length++] = len;\r
+                } while (len && copy < have);\r
+                if (state->flags & 0x0200)\r
+                    state->check = crc32(state->check, next, copy);\r
+                have -= copy;\r
+                next += copy;\r
+                if (len) goto inf_leave;\r
+            }\r
+            else if (state->head != Z_NULL)\r
+                state->head->name = Z_NULL;\r
+            state->length = 0;\r
+            state->mode = COMMENT;\r
+        case COMMENT:\r
+            if (state->flags & 0x1000) {\r
+                if (have == 0) goto inf_leave;\r
+                copy = 0;\r
+                do {\r
+                    len = (unsigned)(next[copy++]);\r
+                    if (state->head != Z_NULL &&\r
+                            state->head->comment != Z_NULL &&\r
+                            state->length < state->head->comm_max)\r
+                        state->head->comment[state->length++] = len;\r
+                } while (len && copy < have);\r
+                if (state->flags & 0x0200)\r
+                    state->check = crc32(state->check, next, copy);\r
+                have -= copy;\r
+                next += copy;\r
+                if (len) goto inf_leave;\r
+            }\r
+            else if (state->head != Z_NULL)\r
+                state->head->comment = Z_NULL;\r
+            state->mode = HCRC;\r
+        case HCRC:\r
+            if (state->flags & 0x0200) {\r
+                NEEDBITS(16);\r
+                if (hold != (state->check & 0xffff)) {\r
+                    strm->msg = (char *)"header crc mismatch";\r
+                    state->mode = BAD;\r
+                    break;\r
+                }\r
+                INITBITS();\r
+            }\r
+            if (state->head != Z_NULL) {\r
+                state->head->hcrc = (int)((state->flags >> 9) & 1);\r
+                state->head->done = 1;\r
+            }\r
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);\r
+            state->mode = TYPE;\r
+            break;\r
+#endif\r
+        case DICTID:\r
+            NEEDBITS(32);\r
+            strm->adler = state->check = REVERSE(hold);\r
+            INITBITS();\r
+            state->mode = DICT;\r
+        case DICT:\r
+            if (state->havedict == 0) {\r
+                RESTORE();\r
+                return Z_NEED_DICT;\r
+            }\r
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);\r
+            state->mode = TYPE;\r
+        case TYPE:\r
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;\r
+        case TYPEDO:\r
+            if (state->last) {\r
+                BYTEBITS();\r
+                state->mode = CHECK;\r
+                break;\r
+            }\r
+            NEEDBITS(3);\r
+            state->last = BITS(1);\r
+            DROPBITS(1);\r
+            switch (BITS(2)) {\r
+            case 0:                             /* stored block */\r
+                Tracev((stderr, "inflate:     stored block%s\n",\r
+                        state->last ? " (last)" : ""));\r
+                state->mode = STORED;\r
+                break;\r
+            case 1:                             /* fixed block */\r
+                fixedtables(state);\r
+                Tracev((stderr, "inflate:     fixed codes block%s\n",\r
+                        state->last ? " (last)" : ""));\r
+                state->mode = LEN_;             /* decode codes */\r
+                if (flush == Z_TREES) {\r
+                    DROPBITS(2);\r
+                    goto inf_leave;\r
+                }\r
+                break;\r
+            case 2:                             /* dynamic block */\r
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",\r
+                        state->last ? " (last)" : ""));\r
+                state->mode = TABLE;\r
+                break;\r
+            case 3:\r
+                strm->msg = (char *)"invalid block type";\r
+                state->mode = BAD;\r
+            }\r
+            DROPBITS(2);\r
+            break;\r
+        case STORED:\r
+            BYTEBITS();                         /* go to byte boundary */\r
+            NEEDBITS(32);\r
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {\r
+                strm->msg = (char *)"invalid stored block lengths";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            state->length = (unsigned)hold & 0xffff;\r
+            Tracev((stderr, "inflate:       stored length %u\n",\r
+                    state->length));\r
+            INITBITS();\r
+            state->mode = COPY_;\r
+            if (flush == Z_TREES) goto inf_leave;\r
+        case COPY_:\r
+            state->mode = COPY;\r
+        case COPY:\r
+            copy = state->length;\r
+            if (copy) {\r
+                if (copy > have) copy = have;\r
+                if (copy > left) copy = left;\r
+                if (copy == 0) goto inf_leave;\r
+                zmemcpy(put, next, copy);\r
+                have -= copy;\r
+                next += copy;\r
+                left -= copy;\r
+                put += copy;\r
+                state->length -= copy;\r
+                break;\r
+            }\r
+            Tracev((stderr, "inflate:       stored end\n"));\r
+            state->mode = TYPE;\r
+            break;\r
+        case TABLE:\r
+            NEEDBITS(14);\r
+            state->nlen = BITS(5) + 257;\r
+            DROPBITS(5);\r
+            state->ndist = BITS(5) + 1;\r
+            DROPBITS(5);\r
+            state->ncode = BITS(4) + 4;\r
+            DROPBITS(4);\r
+#ifndef PKZIP_BUG_WORKAROUND\r
+            if (state->nlen > 286 || state->ndist > 30) {\r
+                strm->msg = (char *)"too many length or distance symbols";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+#endif\r
+            Tracev((stderr, "inflate:       table sizes ok\n"));\r
+            state->have = 0;\r
+            state->mode = LENLENS;\r
+        case LENLENS:\r
+            while (state->have < state->ncode) {\r
+                NEEDBITS(3);\r
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);\r
+                DROPBITS(3);\r
+            }\r
+            while (state->have < 19)\r
+                state->lens[order[state->have++]] = 0;\r
+            state->next = state->codes;\r
+            state->lencode = (code const FAR *)(state->next);\r
+            state->lenbits = 7;\r
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),\r
+                                &(state->lenbits), state->work);\r
+            if (ret) {\r
+                strm->msg = (char *)"invalid code lengths set";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            Tracev((stderr, "inflate:       code lengths ok\n"));\r
+            state->have = 0;\r
+            state->mode = CODELENS;\r
+        case CODELENS:\r
+            while (state->have < state->nlen + state->ndist) {\r
+                for (;;) {\r
+                    here = state->lencode[BITS(state->lenbits)];\r
+                    if ((unsigned)(here.bits) <= bits) break;\r
+                    PULLBYTE();\r
+                }\r
+                if (here.val < 16) {\r
+                    NEEDBITS(here.bits);\r
+                    DROPBITS(here.bits);\r
+                    state->lens[state->have++] = here.val;\r
+                }\r
+                else {\r
+                    if (here.val == 16) {\r
+                        NEEDBITS(here.bits + 2);\r
+                        DROPBITS(here.bits);\r
+                        if (state->have == 0) {\r
+                            strm->msg = (char *)"invalid bit length repeat";\r
+                            state->mode = BAD;\r
+                            break;\r
+                        }\r
+                        len = state->lens[state->have - 1];\r
+                        copy = 3 + BITS(2);\r
+                        DROPBITS(2);\r
+                    }\r
+                    else if (here.val == 17) {\r
+                        NEEDBITS(here.bits + 3);\r
+                        DROPBITS(here.bits);\r
+                        len = 0;\r
+                        copy = 3 + BITS(3);\r
+                        DROPBITS(3);\r
+                    }\r
+                    else {\r
+                        NEEDBITS(here.bits + 7);\r
+                        DROPBITS(here.bits);\r
+                        len = 0;\r
+                        copy = 11 + BITS(7);\r
+                        DROPBITS(7);\r
+                    }\r
+                    if (state->have + copy > state->nlen + state->ndist) {\r
+                        strm->msg = (char *)"invalid bit length repeat";\r
+                        state->mode = BAD;\r
+                        break;\r
+                    }\r
+                    while (copy--)\r
+                        state->lens[state->have++] = (unsigned short)len;\r
+                }\r
+            }\r
+\r
+            /* handle error breaks in while */\r
+            if (state->mode == BAD) break;\r
+\r
+            /* check for end-of-block code (better have one) */\r
+            if (state->lens[256] == 0) {\r
+                strm->msg = (char *)"invalid code -- missing end-of-block";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+\r
+            /* build code tables -- note: do not change the lenbits or distbits\r
+               values here (9 and 6) without reading the comments in inftrees.h\r
+               concerning the ENOUGH constants, which depend on those values */\r
+            state->next = state->codes;\r
+            state->lencode = (code const FAR *)(state->next);\r
+            state->lenbits = 9;\r
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),\r
+                                &(state->lenbits), state->work);\r
+            if (ret) {\r
+                strm->msg = (char *)"invalid literal/lengths set";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            state->distcode = (code const FAR *)(state->next);\r
+            state->distbits = 6;\r
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,\r
+                            &(state->next), &(state->distbits), state->work);\r
+            if (ret) {\r
+                strm->msg = (char *)"invalid distances set";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            Tracev((stderr, "inflate:       codes ok\n"));\r
+            state->mode = LEN_;\r
+            if (flush == Z_TREES) goto inf_leave;\r
+        case LEN_:\r
+            state->mode = LEN;\r
+        case LEN:\r
+            if (have >= 6 && left >= 258) {\r
+                RESTORE();\r
+                inflate_fast(strm, out);\r
+                LOAD();\r
+                if (state->mode == TYPE)\r
+                    state->back = -1;\r
+                break;\r
+            }\r
+            state->back = 0;\r
+            for (;;) {\r
+                here = state->lencode[BITS(state->lenbits)];\r
+                if ((unsigned)(here.bits) <= bits) break;\r
+                PULLBYTE();\r
+            }\r
+            if (here.op && (here.op & 0xf0) == 0) {\r
+                last = here;\r
+                for (;;) {\r
+                    here = state->lencode[last.val +\r
+                            (BITS(last.bits + last.op) >> last.bits)];\r
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;\r
+                    PULLBYTE();\r
+                }\r
+                DROPBITS(last.bits);\r
+                state->back += last.bits;\r
+            }\r
+            DROPBITS(here.bits);\r
+            state->back += here.bits;\r
+            state->length = (unsigned)here.val;\r
+            if ((int)(here.op) == 0) {\r
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?\r
+                        "inflate:         literal '%c'\n" :\r
+                        "inflate:         literal 0x%02x\n", here.val));\r
+                state->mode = LIT;\r
+                break;\r
+            }\r
+            if (here.op & 32) {\r
+                Tracevv((stderr, "inflate:         end of block\n"));\r
+                state->back = -1;\r
+                state->mode = TYPE;\r
+                break;\r
+            }\r
+            if (here.op & 64) {\r
+                strm->msg = (char *)"invalid literal/length code";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            state->extra = (unsigned)(here.op) & 15;\r
+            state->mode = LENEXT;\r
+        case LENEXT:\r
+            if (state->extra) {\r
+                NEEDBITS(state->extra);\r
+                state->length += BITS(state->extra);\r
+                DROPBITS(state->extra);\r
+                state->back += state->extra;\r
+            }\r
+            Tracevv((stderr, "inflate:         length %u\n", state->length));\r
+            state->was = state->length;\r
+            state->mode = DIST;\r
+        case DIST:\r
+            for (;;) {\r
+                here = state->distcode[BITS(state->distbits)];\r
+                if ((unsigned)(here.bits) <= bits) break;\r
+                PULLBYTE();\r
+            }\r
+            if ((here.op & 0xf0) == 0) {\r
+                last = here;\r
+                for (;;) {\r
+                    here = state->distcode[last.val +\r
+                            (BITS(last.bits + last.op) >> last.bits)];\r
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;\r
+                    PULLBYTE();\r
+                }\r
+                DROPBITS(last.bits);\r
+                state->back += last.bits;\r
+            }\r
+            DROPBITS(here.bits);\r
+            state->back += here.bits;\r
+            if (here.op & 64) {\r
+                strm->msg = (char *)"invalid distance code";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+            state->offset = (unsigned)here.val;\r
+            state->extra = (unsigned)(here.op) & 15;\r
+            state->mode = DISTEXT;\r
+        case DISTEXT:\r
+            if (state->extra) {\r
+                NEEDBITS(state->extra);\r
+                state->offset += BITS(state->extra);\r
+                DROPBITS(state->extra);\r
+                state->back += state->extra;\r
+            }\r
+#ifdef INFLATE_STRICT\r
+            if (state->offset > state->dmax) {\r
+                strm->msg = (char *)"invalid distance too far back";\r
+                state->mode = BAD;\r
+                break;\r
+            }\r
+#endif\r
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));\r
+            state->mode = MATCH;\r
+        case MATCH:\r
+            if (left == 0) goto inf_leave;\r
+            copy = out - left;\r
+            if (state->offset > copy) {         /* copy from window */\r
+                copy = state->offset - copy;\r
+                if (copy > state->whave) {\r
+                    if (state->sane) {\r
+                        strm->msg = (char *)"invalid distance too far back";\r
+                        state->mode = BAD;\r
+                        break;\r
+                    }\r
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR\r
+                    Trace((stderr, "inflate.c too far\n"));\r
+                    copy -= state->whave;\r
+                    if (copy > state->length) copy = state->length;\r
+                    if (copy > left) copy = left;\r
+                    left -= copy;\r
+                    state->length -= copy;\r
+                    do {\r
+                        *put++ = 0;\r
+                    } while (--copy);\r
+                    if (state->length == 0) state->mode = LEN;\r
+                    break;\r
+#endif\r
+                }\r
+                if (copy > state->wnext) {\r
+                    copy -= state->wnext;\r
+                    from = state->window + (state->wsize - copy);\r
+                }\r
+                else\r
+                    from = state->window + (state->wnext - copy);\r
+                if (copy > state->length) copy = state->length;\r
+            }\r
+            else {                              /* copy from output */\r
+                from = put - state->offset;\r
+                copy = state->length;\r
+            }\r
+            if (copy > left) copy = left;\r
+            left -= copy;\r
+            state->length -= copy;\r
+            do {\r
+                *put++ = *from++;\r
+            } while (--copy);\r
+            if (state->length == 0) state->mode = LEN;\r
+            break;\r
+        case LIT:\r
+            if (left == 0) goto inf_leave;\r
+            *put++ = (unsigned char)(state->length);\r
+            left--;\r
+            state->mode = LEN;\r
+            break;\r
+        case CHECK:\r
+            if (state->wrap) {\r
+                NEEDBITS(32);\r
+                out -= left;\r
+                strm->total_out += out;\r
+                state->total += out;\r
+                if (out)\r
+                    strm->adler = state->check =\r
+                        UPDATE(state->check, put - out, out);\r
+                out = left;\r
+                if ((\r
+#ifdef GUNZIP\r
+                     state->flags ? hold :\r
+#endif\r
+                     REVERSE(hold)) != state->check) {\r
+                    strm->msg = (char *)"incorrect data check";\r
+                    state->mode = BAD;\r
+                    break;\r
+                }\r
+                INITBITS();\r
+                Tracev((stderr, "inflate:   check matches trailer\n"));\r
+            }\r
+#ifdef GUNZIP\r
+            state->mode = LENGTH;\r
+        case LENGTH:\r
+            if (state->wrap && state->flags) {\r
+                NEEDBITS(32);\r
+                if (hold != (state->total & 0xffffffffUL)) {\r
+                    strm->msg = (char *)"incorrect length check";\r
+                    state->mode = BAD;\r
+                    break;\r
+                }\r
+                INITBITS();\r
+                Tracev((stderr, "inflate:   length matches trailer\n"));\r
+            }\r
+#endif\r
+            state->mode = DONE;\r
+        case DONE:\r
+            ret = Z_STREAM_END;\r
+            goto inf_leave;\r
+        case BAD:\r
+            ret = Z_DATA_ERROR;\r
+            goto inf_leave;\r
+        case MEM:\r
+            return Z_MEM_ERROR;\r
+        case SYNC:\r
+        default:\r
+            return Z_STREAM_ERROR;\r
+        }\r
+\r
+    /*\r
+       Return from inflate(), updating the total counts and the check value.\r
+       If there was no progress during the inflate() call, return a buffer\r
+       error.  Call updatewindow() to create and/or update the window state.\r
+       Note: a memory error from inflate() is non-recoverable.\r
+     */\r
+  inf_leave:\r
+    RESTORE();\r
+    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))\r
+        if (updatewindow(strm, out)) {\r
+            state->mode = MEM;\r
+            return Z_MEM_ERROR;\r
+        }\r
+    in -= strm->avail_in;\r
+    out -= strm->avail_out;\r
+    strm->total_in += in;\r
+    strm->total_out += out;\r
+    state->total += out;\r
+    if (state->wrap && out)\r
+        strm->adler = state->check =\r
+            UPDATE(state->check, strm->next_out - out, out);\r
+    strm->data_type = state->bits + (state->last ? 64 : 0) +\r
+                      (state->mode == TYPE ? 128 : 0) +\r
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);\r
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)\r
+        ret = Z_BUF_ERROR;\r
+    return ret;\r
+}\r
+\r
+int ZEXPORT inflateEnd(strm)\r
+z_streamp strm;\r
+{\r
+    struct inflate_state FAR *state;\r
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)\r
+        return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    if (state->window != Z_NULL) ZFREE(strm, state->window);\r
+    ZFREE(strm, strm->state);\r
+    strm->state = Z_NULL;\r
+    Tracev((stderr, "inflate: end\n"));\r
+    return Z_OK;\r
+}\r
+\r
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)\r
+z_streamp strm;\r
+const Bytef *dictionary;\r
+uInt dictLength;\r
+{\r
+    struct inflate_state FAR *state;\r
+    unsigned long id;\r
+\r
+    /* check state */\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    if (state->wrap != 0 && state->mode != DICT)\r
+        return Z_STREAM_ERROR;\r
+\r
+    /* check for correct dictionary id */\r
+    if (state->mode == DICT) {\r
+        id = adler32(0L, Z_NULL, 0);\r
+        id = adler32(id, dictionary, dictLength);\r
+        if (id != state->check)\r
+            return Z_DATA_ERROR;\r
+    }\r
+\r
+    /* copy dictionary to window */\r
+    if (updatewindow(strm, strm->avail_out)) {\r
+        state->mode = MEM;\r
+        return Z_MEM_ERROR;\r
+    }\r
+    if (dictLength > state->wsize) {\r
+        zmemcpy(state->window, dictionary + dictLength - state->wsize,\r
+                state->wsize);\r
+        state->whave = state->wsize;\r
+    }\r
+    else {\r
+        zmemcpy(state->window + state->wsize - dictLength, dictionary,\r
+                dictLength);\r
+        state->whave = dictLength;\r
+    }\r
+    state->havedict = 1;\r
+    Tracev((stderr, "inflate:   dictionary set\n"));\r
+    return Z_OK;\r
+}\r
+\r
+int ZEXPORT inflateGetHeader(strm, head)\r
+z_streamp strm;\r
+gz_headerp head;\r
+{\r
+    struct inflate_state FAR *state;\r
+\r
+    /* check state */\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;\r
+\r
+    /* save header structure */\r
+    state->head = head;\r
+    head->done = 0;\r
+    return Z_OK;\r
+}\r
+\r
+/*\r
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found\r
+   or when out of input.  When called, *have is the number of pattern bytes\r
+   found in order so far, in 0..3.  On return *have is updated to the new\r
+   state.  If on return *have equals four, then the pattern was found and the\r
+   return value is how many bytes were read including the last byte of the\r
+   pattern.  If *have is less than four, then the pattern has not been found\r
+   yet and the return value is len.  In the latter case, syncsearch() can be\r
+   called again with more data and the *have state.  *have is initialized to\r
+   zero for the first call.\r
+ */\r
+local unsigned syncsearch(have, buf, len)\r
+unsigned FAR *have;\r
+unsigned char FAR *buf;\r
+unsigned len;\r
+{\r
+    unsigned got;\r
+    unsigned next;\r
+\r
+    got = *have;\r
+    next = 0;\r
+    while (next < len && got < 4) {\r
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))\r
+            got++;\r
+        else if (buf[next])\r
+            got = 0;\r
+        else\r
+            got = 4 - got;\r
+        next++;\r
+    }\r
+    *have = got;\r
+    return next;\r
+}\r
+\r
+int ZEXPORT inflateSync(strm)\r
+z_streamp strm;\r
+{\r
+    unsigned len;               /* number of bytes to look at or looked at */\r
+    unsigned long in, out;      /* temporary to save total_in and total_out */\r
+    unsigned char buf[4];       /* to restore bit buffer to byte string */\r
+    struct inflate_state FAR *state;\r
+\r
+    /* check parameters */\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;\r
+\r
+    /* if first time, start search in bit buffer */\r
+    if (state->mode != SYNC) {\r
+        state->mode = SYNC;\r
+        state->hold <<= state->bits & 7;\r
+        state->bits -= state->bits & 7;\r
+        len = 0;\r
+        while (state->bits >= 8) {\r
+            buf[len++] = (unsigned char)(state->hold);\r
+            state->hold >>= 8;\r
+            state->bits -= 8;\r
+        }\r
+        state->have = 0;\r
+        syncsearch(&(state->have), buf, len);\r
+    }\r
+\r
+    /* search available input */\r
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);\r
+    strm->avail_in -= len;\r
+    strm->next_in += len;\r
+    strm->total_in += len;\r
+\r
+    /* return no joy or set up to restart inflate() on a new block */\r
+    if (state->have != 4) return Z_DATA_ERROR;\r
+    in = strm->total_in;  out = strm->total_out;\r
+    inflateReset(strm);\r
+    strm->total_in = in;  strm->total_out = out;\r
+    state->mode = TYPE;\r
+    return Z_OK;\r
+}\r
+\r
+/*\r
+   Returns true if inflate is currently at the end of a block generated by\r
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP\r
+   implementation to provide an additional safety check. PPP uses\r
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored\r
+   block. When decompressing, PPP checks that at the end of input packet,\r
+   inflate is waiting for these length bytes.\r
+ */\r
+int ZEXPORT inflateSyncPoint(strm)\r
+z_streamp strm;\r
+{\r
+    struct inflate_state FAR *state;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    return state->mode == STORED && state->bits == 0;\r
+}\r
+\r
+int ZEXPORT inflateCopy(dest, source)\r
+z_streamp dest;\r
+z_streamp source;\r
+{\r
+    struct inflate_state FAR *state;\r
+    struct inflate_state FAR *copy;\r
+    unsigned char FAR *window;\r
+    unsigned wsize;\r
+\r
+    /* check input */\r
+    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||\r
+        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)\r
+        return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)source->state;\r
+\r
+    /* allocate space */\r
+    copy = (struct inflate_state FAR *)\r
+           ZALLOC(source, 1, sizeof(struct inflate_state));\r
+    if (copy == Z_NULL) return Z_MEM_ERROR;\r
+    window = Z_NULL;\r
+    if (state->window != Z_NULL) {\r
+        window = (unsigned char FAR *)\r
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));\r
+        if (window == Z_NULL) {\r
+            ZFREE(source, copy);\r
+            return Z_MEM_ERROR;\r
+        }\r
+    }\r
+\r
+    /* copy state */\r
+    zmemcpy(dest, source, sizeof(z_stream));\r
+    zmemcpy(copy, state, sizeof(struct inflate_state));\r
+    if (state->lencode >= state->codes &&\r
+        state->lencode <= state->codes + ENOUGH - 1) {\r
+        copy->lencode = copy->codes + (state->lencode - state->codes);\r
+        copy->distcode = copy->codes + (state->distcode - state->codes);\r
+    }\r
+    copy->next = copy->codes + (state->next - state->codes);\r
+    if (window != Z_NULL) {\r
+        wsize = 1U << state->wbits;\r
+        zmemcpy(window, state->window, wsize);\r
+    }\r
+    copy->window = window;\r
+    dest->state = (struct internal_state FAR *)copy;\r
+    return Z_OK;\r
+}\r
+\r
+int ZEXPORT inflateUndermine(strm, subvert)\r
+z_streamp strm;\r
+int subvert;\r
+{\r
+    struct inflate_state FAR *state;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    state->sane = !subvert;\r
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR\r
+    return Z_OK;\r
+#else\r
+    state->sane = 1;\r
+    return Z_DATA_ERROR;\r
+#endif\r
+}\r
+\r
+long ZEXPORT inflateMark(strm)\r
+z_streamp strm;\r
+{\r
+    struct inflate_state FAR *state;\r
+\r
+    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;\r
+    state = (struct inflate_state FAR *)strm->state;\r
+    return ((long)(state->back) << 16) +\r
+        (state->mode == COPY ? state->length :\r
+            (state->mode == MATCH ? state->was - state->length : 0));\r
+}\r
diff --git a/win32port/zlib/inflate.h b/win32port/zlib/inflate.h
new file mode 100644 (file)
index 0000000..a8ef428
--- /dev/null
@@ -0,0 +1,122 @@
+/* inflate.h -- internal inflate state definition\r
+ * Copyright (C) 1995-2009 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* WARNING: this file should *not* be used by applications. It is\r
+   part of the implementation of the compression library and is\r
+   subject to change. Applications should only use zlib.h.\r
+ */\r
+\r
+/* define NO_GZIP when compiling if you want to disable gzip header and\r
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in\r
+   the crc code when it is not needed.  For shared libraries, gzip decoding\r
+   should be left enabled. */\r
+#ifndef NO_GZIP\r
+#  define GUNZIP\r
+#endif\r
+\r
+/* Possible inflate modes between inflate() calls */\r
+typedef enum {\r
+    HEAD,       /* i: waiting for magic header */\r
+    FLAGS,      /* i: waiting for method and flags (gzip) */\r
+    TIME,       /* i: waiting for modification time (gzip) */\r
+    OS,         /* i: waiting for extra flags and operating system (gzip) */\r
+    EXLEN,      /* i: waiting for extra length (gzip) */\r
+    EXTRA,      /* i: waiting for extra bytes (gzip) */\r
+    NAME,       /* i: waiting for end of file name (gzip) */\r
+    COMMENT,    /* i: waiting for end of comment (gzip) */\r
+    HCRC,       /* i: waiting for header crc (gzip) */\r
+    DICTID,     /* i: waiting for dictionary check value */\r
+    DICT,       /* waiting for inflateSetDictionary() call */\r
+        TYPE,       /* i: waiting for type bits, including last-flag bit */\r
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */\r
+        STORED,     /* i: waiting for stored size (length and complement) */\r
+        COPY_,      /* i/o: same as COPY below, but only first time in */\r
+        COPY,       /* i/o: waiting for input or output to copy stored block */\r
+        TABLE,      /* i: waiting for dynamic block table lengths */\r
+        LENLENS,    /* i: waiting for code length code lengths */\r
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */\r
+            LEN_,       /* i: same as LEN below, but only first time in */\r
+            LEN,        /* i: waiting for length/lit/eob code */\r
+            LENEXT,     /* i: waiting for length extra bits */\r
+            DIST,       /* i: waiting for distance code */\r
+            DISTEXT,    /* i: waiting for distance extra bits */\r
+            MATCH,      /* o: waiting for output space to copy string */\r
+            LIT,        /* o: waiting for output space to write literal */\r
+    CHECK,      /* i: waiting for 32-bit check value */\r
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */\r
+    DONE,       /* finished check, done -- remain here until reset */\r
+    BAD,        /* got a data error -- remain here until reset */\r
+    MEM,        /* got an inflate() memory error -- remain here until reset */\r
+    SYNC        /* looking for synchronization bytes to restart inflate() */\r
+} inflate_mode;\r
+\r
+/*\r
+    State transitions between above modes -\r
+\r
+    (most modes can go to BAD or MEM on error -- not shown for clarity)\r
+\r
+    Process header:\r
+        HEAD -> (gzip) or (zlib) or (raw)\r
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->\r
+                  HCRC -> TYPE\r
+        (zlib) -> DICTID or TYPE\r
+        DICTID -> DICT -> TYPE\r
+        (raw) -> TYPEDO\r
+    Read deflate blocks:\r
+            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK\r
+            STORED -> COPY_ -> COPY -> TYPE\r
+            TABLE -> LENLENS -> CODELENS -> LEN_\r
+            LEN_ -> LEN\r
+    Read deflate codes in fixed or dynamic block:\r
+                LEN -> LENEXT or LIT or TYPE\r
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN\r
+                LIT -> LEN\r
+    Process trailer:\r
+        CHECK -> LENGTH -> DONE\r
+ */\r
+\r
+/* state maintained between inflate() calls.  Approximately 10K bytes. */\r
+struct inflate_state {\r
+    inflate_mode mode;          /* current inflate mode */\r
+    int last;                   /* true if processing last block */\r
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */\r
+    int havedict;               /* true if dictionary provided */\r
+    int flags;                  /* gzip header method and flags (0 if zlib) */\r
+    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */\r
+    unsigned long check;        /* protected copy of check value */\r
+    unsigned long total;        /* protected copy of output count */\r
+    gz_headerp head;            /* where to save gzip header information */\r
+        /* sliding window */\r
+    unsigned wbits;             /* log base 2 of requested window size */\r
+    unsigned wsize;             /* window size or zero if not using window */\r
+    unsigned whave;             /* valid bytes in the window */\r
+    unsigned wnext;             /* window write index */\r
+    unsigned char FAR *window;  /* allocated sliding window, if needed */\r
+        /* bit accumulator */\r
+    unsigned long hold;         /* input bit accumulator */\r
+    unsigned bits;              /* number of bits in "in" */\r
+        /* for string and stored block copying */\r
+    unsigned length;            /* literal or length of data to copy */\r
+    unsigned offset;            /* distance back to copy string from */\r
+        /* for table and code decoding */\r
+    unsigned extra;             /* extra bits needed */\r
+        /* fixed and dynamic code tables */\r
+    code const FAR *lencode;    /* starting table for length/literal codes */\r
+    code const FAR *distcode;   /* starting table for distance codes */\r
+    unsigned lenbits;           /* index bits for lencode */\r
+    unsigned distbits;          /* index bits for distcode */\r
+        /* dynamic table building */\r
+    unsigned ncode;             /* number of code length code lengths */\r
+    unsigned nlen;              /* number of length code lengths */\r
+    unsigned ndist;             /* number of distance code lengths */\r
+    unsigned have;              /* number of code lengths in lens[] */\r
+    code FAR *next;             /* next available space in codes[] */\r
+    unsigned short lens[320];   /* temporary storage for code lengths */\r
+    unsigned short work[288];   /* work area for code table building */\r
+    code codes[ENOUGH];         /* space for code tables */\r
+    int sane;                   /* if false, allow invalid distance too far */\r
+    int back;                   /* bits back of last unprocessed length/lit */\r
+    unsigned was;               /* initial length of match */\r
+};\r
diff --git a/win32port/zlib/inftrees.c b/win32port/zlib/inftrees.c
new file mode 100644 (file)
index 0000000..9dbaec3
--- /dev/null
@@ -0,0 +1,330 @@
+/* inftrees.c -- generate Huffman trees for efficient decoding\r
+ * Copyright (C) 1995-2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+#include "zutil.h"\r
+#include "inftrees.h"\r
+\r
+#define MAXBITS 15\r
+\r
+const char inflate_copyright[] =\r
+   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";\r
+/*\r
+  If you use the zlib library in a product, an acknowledgment is welcome\r
+  in the documentation of your product. If for some reason you cannot\r
+  include such an acknowledgment, I would appreciate that you keep this\r
+  copyright string in the executable of your product.\r
+ */\r
+\r
+/*\r
+   Build a set of tables to decode the provided canonical Huffman code.\r
+   The code lengths are lens[0..codes-1].  The result starts at *table,\r
+   whose indices are 0..2^bits-1.  work is a writable array of at least\r
+   lens shorts, which is used as a work area.  type is the type of code\r
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,\r
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table\r
+   on return points to the next available entry's address.  bits is the\r
+   requested root table index bits, and on return it is the actual root\r
+   table index bits.  It will differ if the request is greater than the\r
+   longest code or if it is less than the shortest code.\r
+ */\r
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)\r
+codetype type;\r
+unsigned short FAR *lens;\r
+unsigned codes;\r
+code FAR * FAR *table;\r
+unsigned FAR *bits;\r
+unsigned short FAR *work;\r
+{\r
+    unsigned len;               /* a code's length in bits */\r
+    unsigned sym;               /* index of code symbols */\r
+    unsigned min, max;          /* minimum and maximum code lengths */\r
+    unsigned root;              /* number of index bits for root table */\r
+    unsigned curr;              /* number of index bits for current table */\r
+    unsigned drop;              /* code bits to drop for sub-table */\r
+    int left;                   /* number of prefix codes available */\r
+    unsigned used;              /* code entries in table used */\r
+    unsigned huff;              /* Huffman code */\r
+    unsigned incr;              /* for incrementing code, index */\r
+    unsigned fill;              /* index for replicating entries */\r
+    unsigned low;               /* low bits for current root entry */\r
+    unsigned mask;              /* mask for low root bits */\r
+    code here;                  /* table entry for duplication */\r
+    code FAR *next;             /* next available space in table */\r
+    const unsigned short FAR *base;     /* base value table to use */\r
+    const unsigned short FAR *extra;    /* extra bits table to use */\r
+    int end;                    /* use base and extra for symbol > end */\r
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */\r
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */\r
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */\r
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,\r
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};\r
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */\r
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,\r
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};\r
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */\r
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,\r
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,\r
+        8193, 12289, 16385, 24577, 0, 0};\r
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */\r
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,\r
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,\r
+        28, 28, 29, 29, 64, 64};\r
+\r
+    /*\r
+       Process a set of code lengths to create a canonical Huffman code.  The\r
+       code lengths are lens[0..codes-1].  Each length corresponds to the\r
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the\r
+       symbols by length from short to long, and retaining the symbol order\r
+       for codes with equal lengths.  Then the code starts with all zero bits\r
+       for the first code of the shortest length, and the codes are integer\r
+       increments for the same length, and zeros are appended as the length\r
+       increases.  For the deflate format, these bits are stored backwards\r
+       from their more natural integer increment ordering, and so when the\r
+       decoding tables are built in the large loop below, the integer codes\r
+       are incremented backwards.\r
+\r
+       This routine assumes, but does not check, that all of the entries in\r
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.\r
+       1..MAXBITS is interpreted as that code length.  zero means that that\r
+       symbol does not occur in this code.\r
+\r
+       The codes are sorted by computing a count of codes for each length,\r
+       creating from that a table of starting indices for each length in the\r
+       sorted table, and then entering the symbols in order in the sorted\r
+       table.  The sorted table is work[], with that space being provided by\r
+       the caller.\r
+\r
+       The length counts are used for other purposes as well, i.e. finding\r
+       the minimum and maximum length codes, determining if there are any\r
+       codes at all, checking for a valid set of lengths, and looking ahead\r
+       at length counts to determine sub-table sizes when building the\r
+       decoding tables.\r
+     */\r
+\r
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */\r
+    for (len = 0; len <= MAXBITS; len++)\r
+        count[len] = 0;\r
+    for (sym = 0; sym < codes; sym++)\r
+        count[lens[sym]]++;\r
+\r
+    /* bound code lengths, force root to be within code lengths */\r
+    root = *bits;\r
+    for (max = MAXBITS; max >= 1; max--)\r
+        if (count[max] != 0) break;\r
+    if (root > max) root = max;\r
+    if (max == 0) {                     /* no symbols to code at all */\r
+        here.op = (unsigned char)64;    /* invalid code marker */\r
+        here.bits = (unsigned char)1;\r
+        here.val = (unsigned short)0;\r
+        *(*table)++ = here;             /* make a table to force an error */\r
+        *(*table)++ = here;\r
+        *bits = 1;\r
+        return 0;     /* no symbols, but wait for decoding to report error */\r
+    }\r
+    for (min = 1; min < max; min++)\r
+        if (count[min] != 0) break;\r
+    if (root < min) root = min;\r
+\r
+    /* check for an over-subscribed or incomplete set of lengths */\r
+    left = 1;\r
+    for (len = 1; len <= MAXBITS; len++) {\r
+        left <<= 1;\r
+        left -= count[len];\r
+        if (left < 0) return -1;        /* over-subscribed */\r
+    }\r
+    if (left > 0 && (type == CODES || max != 1))\r
+        return -1;                      /* incomplete set */\r
+\r
+    /* generate offsets into symbol table for each length for sorting */\r
+    offs[1] = 0;\r
+    for (len = 1; len < MAXBITS; len++)\r
+        offs[len + 1] = offs[len] + count[len];\r
+\r
+    /* sort symbols by length, by symbol order within each length */\r
+    for (sym = 0; sym < codes; sym++)\r
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;\r
+\r
+    /*\r
+       Create and fill in decoding tables.  In this loop, the table being\r
+       filled is at next and has curr index bits.  The code being used is huff\r
+       with length len.  That code is converted to an index by dropping drop\r
+       bits off of the bottom.  For codes where len is less than drop + curr,\r
+       those top drop + curr - len bits are incremented through all values to\r
+       fill the table with replicated entries.\r
+\r
+       root is the number of index bits for the root table.  When len exceeds\r
+       root, sub-tables are created pointed to by the root entry with an index\r
+       of the low root bits of huff.  This is saved in low to check for when a\r
+       new sub-table should be started.  drop is zero when the root table is\r
+       being filled, and drop is root when sub-tables are being filled.\r
+\r
+       When a new sub-table is needed, it is necessary to look ahead in the\r
+       code lengths to determine what size sub-table is needed.  The length\r
+       counts are used for this, and so count[] is decremented as codes are\r
+       entered in the tables.\r
+\r
+       used keeps track of how many table entries have been allocated from the\r
+       provided *table space.  It is checked for LENS and DIST tables against\r
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in\r
+       the initial root table size constants.  See the comments in inftrees.h\r
+       for more information.\r
+\r
+       sym increments through all symbols, and the loop terminates when\r
+       all codes of length max, i.e. all codes, have been processed.  This\r
+       routine permits incomplete codes, so another loop after this one fills\r
+       in the rest of the decoding tables with invalid code markers.\r
+     */\r
+\r
+    /* set up for code type */\r
+    switch (type) {\r
+    case CODES:\r
+        base = extra = work;    /* dummy value--not used */\r
+        end = 19;\r
+        break;\r
+    case LENS:\r
+        base = lbase;\r
+        base -= 257;\r
+        extra = lext;\r
+        extra -= 257;\r
+        end = 256;\r
+        break;\r
+    default:            /* DISTS */\r
+        base = dbase;\r
+        extra = dext;\r
+        end = -1;\r
+    }\r
+\r
+    /* initialize state for loop */\r
+    huff = 0;                   /* starting code */\r
+    sym = 0;                    /* starting code symbol */\r
+    len = min;                  /* starting code length */\r
+    next = *table;              /* current table to fill in */\r
+    curr = root;                /* current table index bits */\r
+    drop = 0;                   /* current bits to drop from code for index */\r
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */\r
+    used = 1U << root;          /* use root table entries */\r
+    mask = used - 1;            /* mask for comparing low */\r
+\r
+    /* check available table space */\r
+    if ((type == LENS && used >= ENOUGH_LENS) ||\r
+        (type == DISTS && used >= ENOUGH_DISTS))\r
+        return 1;\r
+\r
+    /* process all codes and make table entries */\r
+    for (;;) {\r
+        /* create table entry */\r
+        here.bits = (unsigned char)(len - drop);\r
+        if ((int)(work[sym]) < end) {\r
+            here.op = (unsigned char)0;\r
+            here.val = work[sym];\r
+        }\r
+        else if ((int)(work[sym]) > end) {\r
+            here.op = (unsigned char)(extra[work[sym]]);\r
+            here.val = base[work[sym]];\r
+        }\r
+        else {\r
+            here.op = (unsigned char)(32 + 64);         /* end of block */\r
+            here.val = 0;\r
+        }\r
+\r
+        /* replicate for those indices with low len bits equal to huff */\r
+        incr = 1U << (len - drop);\r
+        fill = 1U << curr;\r
+        min = fill;                 /* save offset to next table */\r
+        do {\r
+            fill -= incr;\r
+            next[(huff >> drop) + fill] = here;\r
+        } while (fill != 0);\r
+\r
+        /* backwards increment the len-bit code huff */\r
+        incr = 1U << (len - 1);\r
+        while (huff & incr)\r
+            incr >>= 1;\r
+        if (incr != 0) {\r
+            huff &= incr - 1;\r
+            huff += incr;\r
+        }\r
+        else\r
+            huff = 0;\r
+\r
+        /* go to next symbol, update count, len */\r
+        sym++;\r
+        if (--(count[len]) == 0) {\r
+            if (len == max) break;\r
+            len = lens[work[sym]];\r
+        }\r
+\r
+        /* create new sub-table if needed */\r
+        if (len > root && (huff & mask) != low) {\r
+            /* if first time, transition to sub-tables */\r
+            if (drop == 0)\r
+                drop = root;\r
+\r
+            /* increment past last table */\r
+            next += min;            /* here min is 1 << curr */\r
+\r
+            /* determine length of next table */\r
+            curr = len - drop;\r
+            left = (int)(1 << curr);\r
+            while (curr + drop < max) {\r
+                left -= count[curr + drop];\r
+                if (left <= 0) break;\r
+                curr++;\r
+                left <<= 1;\r
+            }\r
+\r
+            /* check for enough space */\r
+            used += 1U << curr;\r
+            if ((type == LENS && used >= ENOUGH_LENS) ||\r
+                (type == DISTS && used >= ENOUGH_DISTS))\r
+                return 1;\r
+\r
+            /* point entry in root table to sub-table */\r
+            low = huff & mask;\r
+            (*table)[low].op = (unsigned char)curr;\r
+            (*table)[low].bits = (unsigned char)root;\r
+            (*table)[low].val = (unsigned short)(next - *table);\r
+        }\r
+    }\r
+\r
+    /*\r
+       Fill in rest of table for incomplete codes.  This loop is similar to the\r
+       loop above in incrementing huff for table indices.  It is assumed that\r
+       len is equal to curr + drop, so there is no loop needed to increment\r
+       through high index bits.  When the current sub-table is filled, the loop\r
+       drops back to the root table to fill in any remaining entries there.\r
+     */\r
+    here.op = (unsigned char)64;                /* invalid code marker */\r
+    here.bits = (unsigned char)(len - drop);\r
+    here.val = (unsigned short)0;\r
+    while (huff != 0) {\r
+        /* when done with sub-table, drop back to root table */\r
+        if (drop != 0 && (huff & mask) != low) {\r
+            drop = 0;\r
+            len = root;\r
+            next = *table;\r
+            here.bits = (unsigned char)len;\r
+        }\r
+\r
+        /* put invalid code marker in table */\r
+        next[huff >> drop] = here;\r
+\r
+        /* backwards increment the len-bit code huff */\r
+        incr = 1U << (len - 1);\r
+        while (huff & incr)\r
+            incr >>= 1;\r
+        if (incr != 0) {\r
+            huff &= incr - 1;\r
+            huff += incr;\r
+        }\r
+        else\r
+            huff = 0;\r
+    }\r
+\r
+    /* set return parameters */\r
+    *table += used;\r
+    *bits = root;\r
+    return 0;\r
+}\r
diff --git a/win32port/zlib/inftrees.h b/win32port/zlib/inftrees.h
new file mode 100644 (file)
index 0000000..a685d8c
--- /dev/null
@@ -0,0 +1,62 @@
+/* inftrees.h -- header to use inftrees.c\r
+ * Copyright (C) 1995-2005, 2010 Mark Adler\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* WARNING: this file should *not* be used by applications. It is\r
+   part of the implementation of the compression library and is\r
+   subject to change. Applications should only use zlib.h.\r
+ */\r
+\r
+/* Structure for decoding tables.  Each entry provides either the\r
+   information needed to do the operation requested by the code that\r
+   indexed that table entry, or it provides a pointer to another\r
+   table that indexes more bits of the code.  op indicates whether\r
+   the entry is a pointer to another table, a literal, a length or\r
+   distance, an end-of-block, or an invalid code.  For a table\r
+   pointer, the low four bits of op is the number of index bits of\r
+   that table.  For a length or distance, the low four bits of op\r
+   is the number of extra bits to get after the code.  bits is\r
+   the number of bits in this code or part of the code to drop off\r
+   of the bit buffer.  val is the actual byte to output in the case\r
+   of a literal, the base length or distance, or the offset from\r
+   the current table to the next table.  Each entry is four bytes. */\r
+typedef struct {\r
+    unsigned char op;           /* operation, extra bits, table bits */\r
+    unsigned char bits;         /* bits in this part of the code */\r
+    unsigned short val;         /* offset in table or code value */\r
+} code;\r
+\r
+/* op values as set by inflate_table():\r
+    00000000 - literal\r
+    0000tttt - table link, tttt != 0 is the number of table index bits\r
+    0001eeee - length or distance, eeee is the number of extra bits\r
+    01100000 - end of block\r
+    01000000 - invalid code\r
+ */\r
+\r
+/* Maximum size of the dynamic table.  The maximum number of code structures is\r
+   1444, which is the sum of 852 for literal/length codes and 592 for distance\r
+   codes.  These values were found by exhaustive searches using the program\r
+   examples/enough.c found in the zlib distribtution.  The arguments to that\r
+   program are the number of symbols, the initial root table size, and the\r
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes\r
+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.\r
+   The initial root table size (9 or 6) is found in the fifth argument of the\r
+   inflate_table() calls in inflate.c and infback.c.  If the root table size is\r
+   changed, then these maximum sizes would be need to be recalculated and\r
+   updated. */\r
+#define ENOUGH_LENS 852\r
+#define ENOUGH_DISTS 592\r
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)\r
+\r
+/* Type of code to build for inflate_table() */\r
+typedef enum {\r
+    CODES,\r
+    LENS,\r
+    DISTS\r
+} codetype;\r
+\r
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,\r
+                             unsigned codes, code FAR * FAR *table,\r
+                             unsigned FAR *bits, unsigned short FAR *work));\r
diff --git a/win32port/zlib/trees.c b/win32port/zlib/trees.c
new file mode 100644 (file)
index 0000000..b4a317a
--- /dev/null
@@ -0,0 +1,1244 @@
+/* trees.c -- output deflated data using Huffman coding\r
+ * Copyright (C) 1995-2010 Jean-loup Gailly\r
+ * detect_data_type() function provided freely by Cosmin Truta, 2006\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/*\r
+ *  ALGORITHM\r
+ *\r
+ *      The "deflation" process uses several Huffman trees. The more\r
+ *      common source values are represented by shorter bit sequences.\r
+ *\r
+ *      Each code tree is stored in a compressed form which is itself\r
+ * a Huffman encoding of the lengths of all the code strings (in\r
+ * ascending order by source values).  The actual code strings are\r
+ * reconstructed from the lengths in the inflate process, as described\r
+ * in the deflate specification.\r
+ *\r
+ *  REFERENCES\r
+ *\r
+ *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".\r
+ *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc\r
+ *\r
+ *      Storer, James A.\r
+ *          Data Compression:  Methods and Theory, pp. 49-50.\r
+ *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.\r
+ *\r
+ *      Sedgewick, R.\r
+ *          Algorithms, p290.\r
+ *          Addison-Wesley, 1983. ISBN 0-201-06672-6.\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+/* #define GEN_TREES_H */\r
+\r
+#include "deflate.h"\r
+\r
+#ifdef DEBUG\r
+#  include <ctype.h>\r
+#endif\r
+\r
+/* ===========================================================================\r
+ * Constants\r
+ */\r
+\r
+#define MAX_BL_BITS 7\r
+/* Bit length codes must not exceed MAX_BL_BITS bits */\r
+\r
+#define END_BLOCK 256\r
+/* end of block literal code */\r
+\r
+#define REP_3_6      16\r
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */\r
+\r
+#define REPZ_3_10    17\r
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */\r
+\r
+#define REPZ_11_138  18\r
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */\r
+\r
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */\r
+   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};\r
+\r
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */\r
+   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};\r
+\r
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */\r
+   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};\r
+\r
+local const uch bl_order[BL_CODES]\r
+   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};\r
+/* The lengths of the bit length codes are sent in order of decreasing\r
+ * probability, to avoid transmitting the lengths for unused bit length codes.\r
+ */\r
+\r
+#define Buf_size (8 * 2*sizeof(char))\r
+/* Number of bits used within bi_buf. (bi_buf might be implemented on\r
+ * more than 16 bits on some systems.)\r
+ */\r
+\r
+/* ===========================================================================\r
+ * Local data. These are initialized only once.\r
+ */\r
+\r
+#define DIST_CODE_LEN  512 /* see definition of array dist_code below */\r
+\r
+#if defined(GEN_TREES_H) || !defined(STDC)\r
+/* non ANSI compilers may not accept trees.h */\r
+\r
+local ct_data static_ltree[L_CODES+2];\r
+/* The static literal tree. Since the bit lengths are imposed, there is no\r
+ * need for the L_CODES extra codes used during heap construction. However\r
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init\r
+ * below).\r
+ */\r
+\r
+local ct_data static_dtree[D_CODES];\r
+/* The static distance tree. (Actually a trivial tree since all codes use\r
+ * 5 bits.)\r
+ */\r
+\r
+uch _dist_code[DIST_CODE_LEN];\r
+/* Distance codes. The first 256 values correspond to the distances\r
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of\r
+ * the 15 bit distances.\r
+ */\r
+\r
+uch _length_code[MAX_MATCH-MIN_MATCH+1];\r
+/* length code for each normalized match length (0 == MIN_MATCH) */\r
+\r
+local int base_length[LENGTH_CODES];\r
+/* First normalized length for each code (0 = MIN_MATCH) */\r
+\r
+local int base_dist[D_CODES];\r
+/* First normalized distance for each code (0 = distance of 1) */\r
+\r
+#else\r
+#  include "trees.h"\r
+#endif /* GEN_TREES_H */\r
+\r
+struct static_tree_desc_s {\r
+    const ct_data *static_tree;  /* static tree or NULL */\r
+    const intf *extra_bits;      /* extra bits for each code or NULL */\r
+    int     extra_base;          /* base index for extra_bits */\r
+    int     elems;               /* max number of elements in the tree */\r
+    int     max_length;          /* max bit length for the codes */\r
+};\r
+\r
+local static_tree_desc  static_l_desc =\r
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};\r
+\r
+local static_tree_desc  static_d_desc =\r
+{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};\r
+\r
+local static_tree_desc  static_bl_desc =\r
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};\r
+\r
+/* ===========================================================================\r
+ * Local (static) routines in this file.\r
+ */\r
+\r
+local void tr_static_init OF((void));\r
+local void init_block     OF((deflate_state *s));\r
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));\r
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));\r
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));\r
+local void build_tree     OF((deflate_state *s, tree_desc *desc));\r
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));\r
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));\r
+local int  build_bl_tree  OF((deflate_state *s));\r
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,\r
+                              int blcodes));\r
+local void compress_block OF((deflate_state *s, ct_data *ltree,\r
+                              ct_data *dtree));\r
+local int  detect_data_type OF((deflate_state *s));\r
+local unsigned bi_reverse OF((unsigned value, int length));\r
+local void bi_windup      OF((deflate_state *s));\r
+local void bi_flush       OF((deflate_state *s));\r
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,\r
+                              int header));\r
+\r
+#ifdef GEN_TREES_H\r
+local void gen_trees_header OF((void));\r
+#endif\r
+\r
+#ifndef DEBUG\r
+#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)\r
+   /* Send a code of the given tree. c and tree must not have side effects */\r
+\r
+#else /* DEBUG */\r
+#  define send_code(s, c, tree) \\r
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \\r
+       send_bits(s, tree[c].Code, tree[c].Len); }\r
+#endif\r
+\r
+/* ===========================================================================\r
+ * Output a short LSB first on the stream.\r
+ * IN assertion: there is enough room in pendingBuf.\r
+ */\r
+#define put_short(s, w) { \\r
+    put_byte(s, (uch)((w) & 0xff)); \\r
+    put_byte(s, (uch)((ush)(w) >> 8)); \\r
+}\r
+\r
+/* ===========================================================================\r
+ * Send a value on a given number of bits.\r
+ * IN assertion: length <= 16 and value fits in length bits.\r
+ */\r
+#ifdef DEBUG\r
+local void send_bits      OF((deflate_state *s, int value, int length));\r
+\r
+local void send_bits(s, value, length)\r
+    deflate_state *s;\r
+    int value;  /* value to send */\r
+    int length; /* number of bits */\r
+{\r
+    Tracevv((stderr," l %2d v %4x ", length, value));\r
+    Assert(length > 0 && length <= 15, "invalid length");\r
+    s->bits_sent += (ulg)length;\r
+\r
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and\r
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))\r
+     * unused bits in value.\r
+     */\r
+    if (s->bi_valid > (int)Buf_size - length) {\r
+        s->bi_buf |= (ush)value << s->bi_valid;\r
+        put_short(s, s->bi_buf);\r
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);\r
+        s->bi_valid += length - Buf_size;\r
+    } else {\r
+        s->bi_buf |= (ush)value << s->bi_valid;\r
+        s->bi_valid += length;\r
+    }\r
+}\r
+#else /* !DEBUG */\r
+\r
+#define send_bits(s, value, length) \\r
+{ int len = length;\\r
+  if (s->bi_valid > (int)Buf_size - len) {\\r
+    int val = value;\\r
+    s->bi_buf |= (ush)val << s->bi_valid;\\r
+    put_short(s, s->bi_buf);\\r
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\\r
+    s->bi_valid += len - Buf_size;\\r
+  } else {\\r
+    s->bi_buf |= (ush)(value) << s->bi_valid;\\r
+    s->bi_valid += len;\\r
+  }\\r
+}\r
+#endif /* DEBUG */\r
+\r
+\r
+/* the arguments must not have side effects */\r
+\r
+/* ===========================================================================\r
+ * Initialize the various 'constant' tables.\r
+ */\r
+local void tr_static_init()\r
+{\r
+#if defined(GEN_TREES_H) || !defined(STDC)\r
+    static int static_init_done = 0;\r
+    int n;        /* iterates over tree elements */\r
+    int bits;     /* bit counter */\r
+    int length;   /* length value */\r
+    int code;     /* code value */\r
+    int dist;     /* distance index */\r
+    ush bl_count[MAX_BITS+1];\r
+    /* number of codes at each bit length for an optimal tree */\r
+\r
+    if (static_init_done) return;\r
+\r
+    /* For some embedded targets, global variables are not initialized: */\r
+#ifdef NO_INIT_GLOBAL_POINTERS\r
+    static_l_desc.static_tree = static_ltree;\r
+    static_l_desc.extra_bits = extra_lbits;\r
+    static_d_desc.static_tree = static_dtree;\r
+    static_d_desc.extra_bits = extra_dbits;\r
+    static_bl_desc.extra_bits = extra_blbits;\r
+#endif\r
+\r
+    /* Initialize the mapping length (0..255) -> length code (0..28) */\r
+    length = 0;\r
+    for (code = 0; code < LENGTH_CODES-1; code++) {\r
+        base_length[code] = length;\r
+        for (n = 0; n < (1<<extra_lbits[code]); n++) {\r
+            _length_code[length++] = (uch)code;\r
+        }\r
+    }\r
+    Assert (length == 256, "tr_static_init: length != 256");\r
+    /* Note that the length 255 (match length 258) can be represented\r
+     * in two different ways: code 284 + 5 bits or code 285, so we\r
+     * overwrite length_code[255] to use the best encoding:\r
+     */\r
+    _length_code[length-1] = (uch)code;\r
+\r
+    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */\r
+    dist = 0;\r
+    for (code = 0 ; code < 16; code++) {\r
+        base_dist[code] = dist;\r
+        for (n = 0; n < (1<<extra_dbits[code]); n++) {\r
+            _dist_code[dist++] = (uch)code;\r
+        }\r
+    }\r
+    Assert (dist == 256, "tr_static_init: dist != 256");\r
+    dist >>= 7; /* from now on, all distances are divided by 128 */\r
+    for ( ; code < D_CODES; code++) {\r
+        base_dist[code] = dist << 7;\r
+        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {\r
+            _dist_code[256 + dist++] = (uch)code;\r
+        }\r
+    }\r
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");\r
+\r
+    /* Construct the codes of the static literal tree */\r
+    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;\r
+    n = 0;\r
+    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;\r
+    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;\r
+    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;\r
+    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;\r
+    /* Codes 286 and 287 do not exist, but we must include them in the\r
+     * tree construction to get a canonical Huffman tree (longest code\r
+     * all ones)\r
+     */\r
+    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);\r
+\r
+    /* The static distance tree is trivial: */\r
+    for (n = 0; n < D_CODES; n++) {\r
+        static_dtree[n].Len = 5;\r
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);\r
+    }\r
+    static_init_done = 1;\r
+\r
+#  ifdef GEN_TREES_H\r
+    gen_trees_header();\r
+#  endif\r
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */\r
+}\r
+\r
+/* ===========================================================================\r
+ * Genererate the file trees.h describing the static trees.\r
+ */\r
+#ifdef GEN_TREES_H\r
+#  ifndef DEBUG\r
+#    include <stdio.h>\r
+#  endif\r
+\r
+#  define SEPARATOR(i, last, width) \\r
+      ((i) == (last)? "\n};\n\n" :    \\r
+       ((i) % (width) == (width)-1 ? ",\n" : ", "))\r
+\r
+void gen_trees_header()\r
+{\r
+    FILE *header = fopen("trees.h", "w");\r
+    int i;\r
+\r
+    Assert (header != NULL, "Can't open trees.h");\r
+    fprintf(header,\r
+            "/* header created automatically with -DGEN_TREES_H */\n\n");\r
+\r
+    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");\r
+    for (i = 0; i < L_CODES+2; i++) {\r
+        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,\r
+                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));\r
+    }\r
+\r
+    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");\r
+    for (i = 0; i < D_CODES; i++) {\r
+        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,\r
+                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));\r
+    }\r
+\r
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");\r
+    for (i = 0; i < DIST_CODE_LEN; i++) {\r
+        fprintf(header, "%2u%s", _dist_code[i],\r
+                SEPARATOR(i, DIST_CODE_LEN-1, 20));\r
+    }\r
+\r
+    fprintf(header,\r
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");\r
+    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {\r
+        fprintf(header, "%2u%s", _length_code[i],\r
+                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));\r
+    }\r
+\r
+    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");\r
+    for (i = 0; i < LENGTH_CODES; i++) {\r
+        fprintf(header, "%1u%s", base_length[i],\r
+                SEPARATOR(i, LENGTH_CODES-1, 20));\r
+    }\r
+\r
+    fprintf(header, "local const int base_dist[D_CODES] = {\n");\r
+    for (i = 0; i < D_CODES; i++) {\r
+        fprintf(header, "%5u%s", base_dist[i],\r
+                SEPARATOR(i, D_CODES-1, 10));\r
+    }\r
+\r
+    fclose(header);\r
+}\r
+#endif /* GEN_TREES_H */\r
+\r
+/* ===========================================================================\r
+ * Initialize the tree data structures for a new zlib stream.\r
+ */\r
+void ZLIB_INTERNAL _tr_init(s)\r
+    deflate_state *s;\r
+{\r
+    tr_static_init();\r
+\r
+    s->l_desc.dyn_tree = s->dyn_ltree;\r
+    s->l_desc.stat_desc = &static_l_desc;\r
+\r
+    s->d_desc.dyn_tree = s->dyn_dtree;\r
+    s->d_desc.stat_desc = &static_d_desc;\r
+\r
+    s->bl_desc.dyn_tree = s->bl_tree;\r
+    s->bl_desc.stat_desc = &static_bl_desc;\r
+\r
+    s->bi_buf = 0;\r
+    s->bi_valid = 0;\r
+    s->last_eob_len = 8; /* enough lookahead for inflate */\r
+#ifdef DEBUG\r
+    s->compressed_len = 0L;\r
+    s->bits_sent = 0L;\r
+#endif\r
+\r
+    /* Initialize the first block of the first file: */\r
+    init_block(s);\r
+}\r
+\r
+/* ===========================================================================\r
+ * Initialize a new block.\r
+ */\r
+local void init_block(s)\r
+    deflate_state *s;\r
+{\r
+    int n; /* iterates over tree elements */\r
+\r
+    /* Initialize the trees. */\r
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;\r
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;\r
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;\r
+\r
+    s->dyn_ltree[END_BLOCK].Freq = 1;\r
+    s->opt_len = s->static_len = 0L;\r
+    s->last_lit = s->matches = 0;\r
+}\r
+\r
+#define SMALLEST 1\r
+/* Index within the heap array of least frequent node in the Huffman tree */\r
+\r
+\r
+/* ===========================================================================\r
+ * Remove the smallest element from the heap and recreate the heap with\r
+ * one less element. Updates heap and heap_len.\r
+ */\r
+#define pqremove(s, tree, top) \\r
+{\\r
+    top = s->heap[SMALLEST]; \\r
+    s->heap[SMALLEST] = s->heap[s->heap_len--]; \\r
+    pqdownheap(s, tree, SMALLEST); \\r
+}\r
+\r
+/* ===========================================================================\r
+ * Compares to subtrees, using the tree depth as tie breaker when\r
+ * the subtrees have equal frequency. This minimizes the worst case length.\r
+ */\r
+#define smaller(tree, n, m, depth) \\r
+   (tree[n].Freq < tree[m].Freq || \\r
+   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))\r
+\r
+/* ===========================================================================\r
+ * Restore the heap property by moving down the tree starting at node k,\r
+ * exchanging a node with the smallest of its two sons if necessary, stopping\r
+ * when the heap property is re-established (each father smaller than its\r
+ * two sons).\r
+ */\r
+local void pqdownheap(s, tree, k)\r
+    deflate_state *s;\r
+    ct_data *tree;  /* the tree to restore */\r
+    int k;               /* node to move down */\r
+{\r
+    int v = s->heap[k];\r
+    int j = k << 1;  /* left son of k */\r
+    while (j <= s->heap_len) {\r
+        /* Set j to the smallest of the two sons: */\r
+        if (j < s->heap_len &&\r
+            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {\r
+            j++;\r
+        }\r
+        /* Exit if v is smaller than both sons */\r
+        if (smaller(tree, v, s->heap[j], s->depth)) break;\r
+\r
+        /* Exchange v with the smallest son */\r
+        s->heap[k] = s->heap[j];  k = j;\r
+\r
+        /* And continue down the tree, setting j to the left son of k */\r
+        j <<= 1;\r
+    }\r
+    s->heap[k] = v;\r
+}\r
+\r
+/* ===========================================================================\r
+ * Compute the optimal bit lengths for a tree and update the total bit length\r
+ * for the current block.\r
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and\r
+ *    above are the tree nodes sorted by increasing frequency.\r
+ * OUT assertions: the field len is set to the optimal bit length, the\r
+ *     array bl_count contains the frequencies for each bit length.\r
+ *     The length opt_len is updated; static_len is also updated if stree is\r
+ *     not null.\r
+ */\r
+local void gen_bitlen(s, desc)\r
+    deflate_state *s;\r
+    tree_desc *desc;    /* the tree descriptor */\r
+{\r
+    ct_data *tree        = desc->dyn_tree;\r
+    int max_code         = desc->max_code;\r
+    const ct_data *stree = desc->stat_desc->static_tree;\r
+    const intf *extra    = desc->stat_desc->extra_bits;\r
+    int base             = desc->stat_desc->extra_base;\r
+    int max_length       = desc->stat_desc->max_length;\r
+    int h;              /* heap index */\r
+    int n, m;           /* iterate over the tree elements */\r
+    int bits;           /* bit length */\r
+    int xbits;          /* extra bits */\r
+    ush f;              /* frequency */\r
+    int overflow = 0;   /* number of elements with bit length too large */\r
+\r
+    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;\r
+\r
+    /* In a first pass, compute the optimal bit lengths (which may\r
+     * overflow in the case of the bit length tree).\r
+     */\r
+    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */\r
+\r
+    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {\r
+        n = s->heap[h];\r
+        bits = tree[tree[n].Dad].Len + 1;\r
+        if (bits > max_length) bits = max_length, overflow++;\r
+        tree[n].Len = (ush)bits;\r
+        /* We overwrite tree[n].Dad which is no longer needed */\r
+\r
+        if (n > max_code) continue; /* not a leaf node */\r
+\r
+        s->bl_count[bits]++;\r
+        xbits = 0;\r
+        if (n >= base) xbits = extra[n-base];\r
+        f = tree[n].Freq;\r
+        s->opt_len += (ulg)f * (bits + xbits);\r
+        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);\r
+    }\r
+    if (overflow == 0) return;\r
+\r
+    Trace((stderr,"\nbit length overflow\n"));\r
+    /* This happens for example on obj2 and pic of the Calgary corpus */\r
+\r
+    /* Find the first bit length which could increase: */\r
+    do {\r
+        bits = max_length-1;\r
+        while (s->bl_count[bits] == 0) bits--;\r
+        s->bl_count[bits]--;      /* move one leaf down the tree */\r
+        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */\r
+        s->bl_count[max_length]--;\r
+        /* The brother of the overflow item also moves one step up,\r
+         * but this does not affect bl_count[max_length]\r
+         */\r
+        overflow -= 2;\r
+    } while (overflow > 0);\r
+\r
+    /* Now recompute all bit lengths, scanning in increasing frequency.\r
+     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all\r
+     * lengths instead of fixing only the wrong ones. This idea is taken\r
+     * from 'ar' written by Haruhiko Okumura.)\r
+     */\r
+    for (bits = max_length; bits != 0; bits--) {\r
+        n = s->bl_count[bits];\r
+        while (n != 0) {\r
+            m = s->heap[--h];\r
+            if (m > max_code) continue;\r
+            if ((unsigned) tree[m].Len != (unsigned) bits) {\r
+                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));\r
+                s->opt_len += ((long)bits - (long)tree[m].Len)\r
+                              *(long)tree[m].Freq;\r
+                tree[m].Len = (ush)bits;\r
+            }\r
+            n--;\r
+        }\r
+    }\r
+}\r
+\r
+/* ===========================================================================\r
+ * Generate the codes for a given tree and bit counts (which need not be\r
+ * optimal).\r
+ * IN assertion: the array bl_count contains the bit length statistics for\r
+ * the given tree and the field len is set for all tree elements.\r
+ * OUT assertion: the field code is set for all tree elements of non\r
+ *     zero code length.\r
+ */\r
+local void gen_codes (tree, max_code, bl_count)\r
+    ct_data *tree;             /* the tree to decorate */\r
+    int max_code;              /* largest code with non zero frequency */\r
+    ushf *bl_count;            /* number of codes at each bit length */\r
+{\r
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */\r
+    ush code = 0;              /* running code value */\r
+    int bits;                  /* bit index */\r
+    int n;                     /* code index */\r
+\r
+    /* The distribution counts are first used to generate the code values\r
+     * without bit reversal.\r
+     */\r
+    for (bits = 1; bits <= MAX_BITS; bits++) {\r
+        next_code[bits] = code = (code + bl_count[bits-1]) << 1;\r
+    }\r
+    /* Check that the bit counts in bl_count are consistent. The last code\r
+     * must be all ones.\r
+     */\r
+    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,\r
+            "inconsistent bit counts");\r
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));\r
+\r
+    for (n = 0;  n <= max_code; n++) {\r
+        int len = tree[n].Len;\r
+        if (len == 0) continue;\r
+        /* Now reverse the bits */\r
+        tree[n].Code = bi_reverse(next_code[len]++, len);\r
+\r
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",\r
+             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));\r
+    }\r
+}\r
+\r
+/* ===========================================================================\r
+ * Construct one Huffman tree and assigns the code bit strings and lengths.\r
+ * Update the total bit length for the current block.\r
+ * IN assertion: the field freq is set for all tree elements.\r
+ * OUT assertions: the fields len and code are set to the optimal bit length\r
+ *     and corresponding code. The length opt_len is updated; static_len is\r
+ *     also updated if stree is not null. The field max_code is set.\r
+ */\r
+local void build_tree(s, desc)\r
+    deflate_state *s;\r
+    tree_desc *desc; /* the tree descriptor */\r
+{\r
+    ct_data *tree         = desc->dyn_tree;\r
+    const ct_data *stree  = desc->stat_desc->static_tree;\r
+    int elems             = desc->stat_desc->elems;\r
+    int n, m;          /* iterate over heap elements */\r
+    int max_code = -1; /* largest code with non zero frequency */\r
+    int node;          /* new node being created */\r
+\r
+    /* Construct the initial heap, with least frequent element in\r
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].\r
+     * heap[0] is not used.\r
+     */\r
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;\r
+\r
+    for (n = 0; n < elems; n++) {\r
+        if (tree[n].Freq != 0) {\r
+            s->heap[++(s->heap_len)] = max_code = n;\r
+            s->depth[n] = 0;\r
+        } else {\r
+            tree[n].Len = 0;\r
+        }\r
+    }\r
+\r
+    /* The pkzip format requires that at least one distance code exists,\r
+     * and that at least one bit should be sent even if there is only one\r
+     * possible code. So to avoid special checks later on we force at least\r
+     * two codes of non zero frequency.\r
+     */\r
+    while (s->heap_len < 2) {\r
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);\r
+        tree[node].Freq = 1;\r
+        s->depth[node] = 0;\r
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;\r
+        /* node is 0 or 1 so it does not have extra bits */\r
+    }\r
+    desc->max_code = max_code;\r
+\r
+    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,\r
+     * establish sub-heaps of increasing lengths:\r
+     */\r
+    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);\r
+\r
+    /* Construct the Huffman tree by repeatedly combining the least two\r
+     * frequent nodes.\r
+     */\r
+    node = elems;              /* next internal node of the tree */\r
+    do {\r
+        pqremove(s, tree, n);  /* n = node of least frequency */\r
+        m = s->heap[SMALLEST]; /* m = node of next least frequency */\r
+\r
+        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */\r
+        s->heap[--(s->heap_max)] = m;\r
+\r
+        /* Create a new node father of n and m */\r
+        tree[node].Freq = tree[n].Freq + tree[m].Freq;\r
+        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?\r
+                                s->depth[n] : s->depth[m]) + 1);\r
+        tree[n].Dad = tree[m].Dad = (ush)node;\r
+#ifdef DUMP_BL_TREE\r
+        if (tree == s->bl_tree) {\r
+            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",\r
+                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);\r
+        }\r
+#endif\r
+        /* and insert the new node in the heap */\r
+        s->heap[SMALLEST] = node++;\r
+        pqdownheap(s, tree, SMALLEST);\r
+\r
+    } while (s->heap_len >= 2);\r
+\r
+    s->heap[--(s->heap_max)] = s->heap[SMALLEST];\r
+\r
+    /* At this point, the fields freq and dad are set. We can now\r
+     * generate the bit lengths.\r
+     */\r
+    gen_bitlen(s, (tree_desc *)desc);\r
+\r
+    /* The field len is now set, we can generate the bit codes */\r
+    gen_codes ((ct_data *)tree, max_code, s->bl_count);\r
+}\r
+\r
+/* ===========================================================================\r
+ * Scan a literal or distance tree to determine the frequencies of the codes\r
+ * in the bit length tree.\r
+ */\r
+local void scan_tree (s, tree, max_code)\r
+    deflate_state *s;\r
+    ct_data *tree;   /* the tree to be scanned */\r
+    int max_code;    /* and its largest code of non zero frequency */\r
+{\r
+    int n;                     /* iterates over all tree elements */\r
+    int prevlen = -1;          /* last emitted length */\r
+    int curlen;                /* length of current code */\r
+    int nextlen = tree[0].Len; /* length of next code */\r
+    int count = 0;             /* repeat count of the current code */\r
+    int max_count = 7;         /* max repeat count */\r
+    int min_count = 4;         /* min repeat count */\r
+\r
+    if (nextlen == 0) max_count = 138, min_count = 3;\r
+    tree[max_code+1].Len = (ush)0xffff; /* guard */\r
+\r
+    for (n = 0; n <= max_code; n++) {\r
+        curlen = nextlen; nextlen = tree[n+1].Len;\r
+        if (++count < max_count && curlen == nextlen) {\r
+            continue;\r
+        } else if (count < min_count) {\r
+            s->bl_tree[curlen].Freq += count;\r
+        } else if (curlen != 0) {\r
+            if (curlen != prevlen) s->bl_tree[curlen].Freq++;\r
+            s->bl_tree[REP_3_6].Freq++;\r
+        } else if (count <= 10) {\r
+            s->bl_tree[REPZ_3_10].Freq++;\r
+        } else {\r
+            s->bl_tree[REPZ_11_138].Freq++;\r
+        }\r
+        count = 0; prevlen = curlen;\r
+        if (nextlen == 0) {\r
+            max_count = 138, min_count = 3;\r
+        } else if (curlen == nextlen) {\r
+            max_count = 6, min_count = 3;\r
+        } else {\r
+            max_count = 7, min_count = 4;\r
+        }\r
+    }\r
+}\r
+\r
+/* ===========================================================================\r
+ * Send a literal or distance tree in compressed form, using the codes in\r
+ * bl_tree.\r
+ */\r
+local void send_tree (s, tree, max_code)\r
+    deflate_state *s;\r
+    ct_data *tree; /* the tree to be scanned */\r
+    int max_code;       /* and its largest code of non zero frequency */\r
+{\r
+    int n;                     /* iterates over all tree elements */\r
+    int prevlen = -1;          /* last emitted length */\r
+    int curlen;                /* length of current code */\r
+    int nextlen = tree[0].Len; /* length of next code */\r
+    int count = 0;             /* repeat count of the current code */\r
+    int max_count = 7;         /* max repeat count */\r
+    int min_count = 4;         /* min repeat count */\r
+\r
+    /* tree[max_code+1].Len = -1; */  /* guard already set */\r
+    if (nextlen == 0) max_count = 138, min_count = 3;\r
+\r
+    for (n = 0; n <= max_code; n++) {\r
+        curlen = nextlen; nextlen = tree[n+1].Len;\r
+        if (++count < max_count && curlen == nextlen) {\r
+            continue;\r
+        } else if (count < min_count) {\r
+            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);\r
+\r
+        } else if (curlen != 0) {\r
+            if (curlen != prevlen) {\r
+                send_code(s, curlen, s->bl_tree); count--;\r
+            }\r
+            Assert(count >= 3 && count <= 6, " 3_6?");\r
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);\r
+\r
+        } else if (count <= 10) {\r
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);\r
+\r
+        } else {\r
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);\r
+        }\r
+        count = 0; prevlen = curlen;\r
+        if (nextlen == 0) {\r
+            max_count = 138, min_count = 3;\r
+        } else if (curlen == nextlen) {\r
+            max_count = 6, min_count = 3;\r
+        } else {\r
+            max_count = 7, min_count = 4;\r
+        }\r
+    }\r
+}\r
+\r
+/* ===========================================================================\r
+ * Construct the Huffman tree for the bit lengths and return the index in\r
+ * bl_order of the last bit length code to send.\r
+ */\r
+local int build_bl_tree(s)\r
+    deflate_state *s;\r
+{\r
+    int max_blindex;  /* index of last bit length code of non zero freq */\r
+\r
+    /* Determine the bit length frequencies for literal and distance trees */\r
+    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);\r
+    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);\r
+\r
+    /* Build the bit length tree: */\r
+    build_tree(s, (tree_desc *)(&(s->bl_desc)));\r
+    /* opt_len now includes the length of the tree representations, except\r
+     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.\r
+     */\r
+\r
+    /* Determine the number of bit length codes to send. The pkzip format\r
+     * requires that at least 4 bit length codes be sent. (appnote.txt says\r
+     * 3 but the actual value used is 4.)\r
+     */\r
+    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {\r
+        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;\r
+    }\r
+    /* Update opt_len to include the bit length tree and counts */\r
+    s->opt_len += 3*(max_blindex+1) + 5+5+4;\r
+    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",\r
+            s->opt_len, s->static_len));\r
+\r
+    return max_blindex;\r
+}\r
+\r
+/* ===========================================================================\r
+ * Send the header for a block using dynamic Huffman trees: the counts, the\r
+ * lengths of the bit length codes, the literal tree and the distance tree.\r
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.\r
+ */\r
+local void send_all_trees(s, lcodes, dcodes, blcodes)\r
+    deflate_state *s;\r
+    int lcodes, dcodes, blcodes; /* number of codes for each tree */\r
+{\r
+    int rank;                    /* index in bl_order */\r
+\r
+    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");\r
+    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,\r
+            "too many codes");\r
+    Tracev((stderr, "\nbl counts: "));\r
+    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */\r
+    send_bits(s, dcodes-1,   5);\r
+    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */\r
+    for (rank = 0; rank < blcodes; rank++) {\r
+        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));\r
+        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);\r
+    }\r
+    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));\r
+\r
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */\r
+    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));\r
+\r
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */\r
+    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));\r
+}\r
+\r
+/* ===========================================================================\r
+ * Send a stored block\r
+ */\r
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)\r
+    deflate_state *s;\r
+    charf *buf;       /* input block */\r
+    ulg stored_len;   /* length of input block */\r
+    int last;         /* one if this is the last block for a file */\r
+{\r
+    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */\r
+#ifdef DEBUG\r
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;\r
+    s->compressed_len += (stored_len + 4) << 3;\r
+#endif\r
+    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */\r
+}\r
+\r
+/* ===========================================================================\r
+ * Send one empty static block to give enough lookahead for inflate.\r
+ * This takes 10 bits, of which 7 may remain in the bit buffer.\r
+ * The current inflate code requires 9 bits of lookahead. If the\r
+ * last two codes for the previous block (real code plus EOB) were coded\r
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode\r
+ * the last real code. In this case we send two empty static blocks instead\r
+ * of one. (There are no problems if the previous block is stored or fixed.)\r
+ * To simplify the code, we assume the worst case of last real code encoded\r
+ * on one bit only.\r
+ */\r
+void ZLIB_INTERNAL _tr_align(s)\r
+    deflate_state *s;\r
+{\r
+    send_bits(s, STATIC_TREES<<1, 3);\r
+    send_code(s, END_BLOCK, static_ltree);\r
+#ifdef DEBUG\r
+    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */\r
+#endif\r
+    bi_flush(s);\r
+    /* Of the 10 bits for the empty block, we have already sent\r
+     * (10 - bi_valid) bits. The lookahead for the last real code (before\r
+     * the EOB of the previous block) was thus at least one plus the length\r
+     * of the EOB plus what we have just sent of the empty static block.\r
+     */\r
+    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {\r
+        send_bits(s, STATIC_TREES<<1, 3);\r
+        send_code(s, END_BLOCK, static_ltree);\r
+#ifdef DEBUG\r
+        s->compressed_len += 10L;\r
+#endif\r
+        bi_flush(s);\r
+    }\r
+    s->last_eob_len = 7;\r
+}\r
+\r
+/* ===========================================================================\r
+ * Determine the best encoding for the current block: dynamic trees, static\r
+ * trees or store, and output the encoded block to the zip file.\r
+ */\r
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)\r
+    deflate_state *s;\r
+    charf *buf;       /* input block, or NULL if too old */\r
+    ulg stored_len;   /* length of input block */\r
+    int last;         /* one if this is the last block for a file */\r
+{\r
+    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */\r
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */\r
+\r
+    /* Build the Huffman trees unless a stored block is forced */\r
+    if (s->level > 0) {\r
+\r
+        /* Check if the file is binary or text */\r
+        if (s->strm->data_type == Z_UNKNOWN)\r
+            s->strm->data_type = detect_data_type(s);\r
+\r
+        /* Construct the literal and distance trees */\r
+        build_tree(s, (tree_desc *)(&(s->l_desc)));\r
+        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,\r
+                s->static_len));\r
+\r
+        build_tree(s, (tree_desc *)(&(s->d_desc)));\r
+        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,\r
+                s->static_len));\r
+        /* At this point, opt_len and static_len are the total bit lengths of\r
+         * the compressed block data, excluding the tree representations.\r
+         */\r
+\r
+        /* Build the bit length tree for the above two trees, and get the index\r
+         * in bl_order of the last bit length code to send.\r
+         */\r
+        max_blindex = build_bl_tree(s);\r
+\r
+        /* Determine the best encoding. Compute the block lengths in bytes. */\r
+        opt_lenb = (s->opt_len+3+7)>>3;\r
+        static_lenb = (s->static_len+3+7)>>3;\r
+\r
+        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",\r
+                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,\r
+                s->last_lit));\r
+\r
+        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;\r
+\r
+    } else {\r
+        Assert(buf != (char*)0, "lost buf");\r
+        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */\r
+    }\r
+\r
+#ifdef FORCE_STORED\r
+    if (buf != (char*)0) { /* force stored block */\r
+#else\r
+    if (stored_len+4 <= opt_lenb && buf != (char*)0) {\r
+                       /* 4: two words for the lengths */\r
+#endif\r
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.\r
+         * Otherwise we can't have processed more than WSIZE input bytes since\r
+         * the last block flush, because compression would have been\r
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to\r
+         * transform a block into a stored block.\r
+         */\r
+        _tr_stored_block(s, buf, stored_len, last);\r
+\r
+#ifdef FORCE_STATIC\r
+    } else if (static_lenb >= 0) { /* force static trees */\r
+#else\r
+    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {\r
+#endif\r
+        send_bits(s, (STATIC_TREES<<1)+last, 3);\r
+        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);\r
+#ifdef DEBUG\r
+        s->compressed_len += 3 + s->static_len;\r
+#endif\r
+    } else {\r
+        send_bits(s, (DYN_TREES<<1)+last, 3);\r
+        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,\r
+                       max_blindex+1);\r
+        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);\r
+#ifdef DEBUG\r
+        s->compressed_len += 3 + s->opt_len;\r
+#endif\r
+    }\r
+    Assert (s->compressed_len == s->bits_sent, "bad compressed size");\r
+    /* The above check is made mod 2^32, for files larger than 512 MB\r
+     * and uLong implemented on 32 bits.\r
+     */\r
+    init_block(s);\r
+\r
+    if (last) {\r
+        bi_windup(s);\r
+#ifdef DEBUG\r
+        s->compressed_len += 7;  /* align on byte boundary */\r
+#endif\r
+    }\r
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,\r
+           s->compressed_len-7*last));\r
+}\r
+\r
+/* ===========================================================================\r
+ * Save the match info and tally the frequency counts. Return true if\r
+ * the current block must be flushed.\r
+ */\r
+int ZLIB_INTERNAL _tr_tally (s, dist, lc)\r
+    deflate_state *s;\r
+    unsigned dist;  /* distance of matched string */\r
+    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */\r
+{\r
+    s->d_buf[s->last_lit] = (ush)dist;\r
+    s->l_buf[s->last_lit++] = (uch)lc;\r
+    if (dist == 0) {\r
+        /* lc is the unmatched char */\r
+        s->dyn_ltree[lc].Freq++;\r
+    } else {\r
+        s->matches++;\r
+        /* Here, lc is the match length - MIN_MATCH */\r
+        dist--;             /* dist = match distance - 1 */\r
+        Assert((ush)dist < (ush)MAX_DIST(s) &&\r
+               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&\r
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");\r
+\r
+        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;\r
+        s->dyn_dtree[d_code(dist)].Freq++;\r
+    }\r
+\r
+#ifdef TRUNCATE_BLOCK\r
+    /* Try to guess if it is profitable to stop the current block here */\r
+    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {\r
+        /* Compute an upper bound for the compressed length */\r
+        ulg out_length = (ulg)s->last_lit*8L;\r
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);\r
+        int dcode;\r
+        for (dcode = 0; dcode < D_CODES; dcode++) {\r
+            out_length += (ulg)s->dyn_dtree[dcode].Freq *\r
+                (5L+extra_dbits[dcode]);\r
+        }\r
+        out_length >>= 3;\r
+        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",\r
+               s->last_lit, in_length, out_length,\r
+               100L - out_length*100L/in_length));\r
+        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;\r
+    }\r
+#endif\r
+    return (s->last_lit == s->lit_bufsize-1);\r
+    /* We avoid equality with lit_bufsize because of wraparound at 64K\r
+     * on 16 bit machines and because stored blocks are restricted to\r
+     * 64K-1 bytes.\r
+     */\r
+}\r
+\r
+/* ===========================================================================\r
+ * Send the block data compressed using the given Huffman trees\r
+ */\r
+local void compress_block(s, ltree, dtree)\r
+    deflate_state *s;\r
+    ct_data *ltree; /* literal tree */\r
+    ct_data *dtree; /* distance tree */\r
+{\r
+    unsigned dist;      /* distance of matched string */\r
+    int lc;             /* match length or unmatched char (if dist == 0) */\r
+    unsigned lx = 0;    /* running index in l_buf */\r
+    unsigned code;      /* the code to send */\r
+    int extra;          /* number of extra bits to send */\r
+\r
+    if (s->last_lit != 0) do {\r
+        dist = s->d_buf[lx];\r
+        lc = s->l_buf[lx++];\r
+        if (dist == 0) {\r
+            send_code(s, lc, ltree); /* send a literal byte */\r
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));\r
+        } else {\r
+            /* Here, lc is the match length - MIN_MATCH */\r
+            code = _length_code[lc];\r
+            send_code(s, code+LITERALS+1, ltree); /* send the length code */\r
+            extra = extra_lbits[code];\r
+            if (extra != 0) {\r
+                lc -= base_length[code];\r
+                send_bits(s, lc, extra);       /* send the extra length bits */\r
+            }\r
+            dist--; /* dist is now the match distance - 1 */\r
+            code = d_code(dist);\r
+            Assert (code < D_CODES, "bad d_code");\r
+\r
+            send_code(s, code, dtree);       /* send the distance code */\r
+            extra = extra_dbits[code];\r
+            if (extra != 0) {\r
+                dist -= base_dist[code];\r
+                send_bits(s, dist, extra);   /* send the extra distance bits */\r
+            }\r
+        } /* literal or match pair ? */\r
+\r
+        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */\r
+        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,\r
+               "pendingBuf overflow");\r
+\r
+    } while (lx < s->last_lit);\r
+\r
+    send_code(s, END_BLOCK, ltree);\r
+    s->last_eob_len = ltree[END_BLOCK].Len;\r
+}\r
+\r
+/* ===========================================================================\r
+ * Check if the data type is TEXT or BINARY, using the following algorithm:\r
+ * - TEXT if the two conditions below are satisfied:\r
+ *    a) There are no non-portable control characters belonging to the\r
+ *       "black list" (0..6, 14..25, 28..31).\r
+ *    b) There is at least one printable character belonging to the\r
+ *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).\r
+ * - BINARY otherwise.\r
+ * - The following partially-portable control characters form a\r
+ *   "gray list" that is ignored in this detection algorithm:\r
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).\r
+ * IN assertion: the fields Freq of dyn_ltree are set.\r
+ */\r
+local int detect_data_type(s)\r
+    deflate_state *s;\r
+{\r
+    /* black_mask is the bit mask of black-listed bytes\r
+     * set bits 0..6, 14..25, and 28..31\r
+     * 0xf3ffc07f = binary 11110011111111111100000001111111\r
+     */\r
+    unsigned long black_mask = 0xf3ffc07fUL;\r
+    int n;\r
+\r
+    /* Check for non-textual ("black-listed") bytes. */\r
+    for (n = 0; n <= 31; n++, black_mask >>= 1)\r
+        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))\r
+            return Z_BINARY;\r
+\r
+    /* Check for textual ("white-listed") bytes. */\r
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0\r
+            || s->dyn_ltree[13].Freq != 0)\r
+        return Z_TEXT;\r
+    for (n = 32; n < LITERALS; n++)\r
+        if (s->dyn_ltree[n].Freq != 0)\r
+            return Z_TEXT;\r
+\r
+    /* There are no "black-listed" or "white-listed" bytes:\r
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.\r
+     */\r
+    return Z_BINARY;\r
+}\r
+\r
+/* ===========================================================================\r
+ * Reverse the first len bits of a code, using straightforward code (a faster\r
+ * method would use a table)\r
+ * IN assertion: 1 <= len <= 15\r
+ */\r
+local unsigned bi_reverse(code, len)\r
+    unsigned code; /* the value to invert */\r
+    int len;       /* its bit length */\r
+{\r
+    register unsigned res = 0;\r
+    do {\r
+        res |= code & 1;\r
+        code >>= 1, res <<= 1;\r
+    } while (--len > 0);\r
+    return res >> 1;\r
+}\r
+\r
+/* ===========================================================================\r
+ * Flush the bit buffer, keeping at most 7 bits in it.\r
+ */\r
+local void bi_flush(s)\r
+    deflate_state *s;\r
+{\r
+    if (s->bi_valid == 16) {\r
+        put_short(s, s->bi_buf);\r
+        s->bi_buf = 0;\r
+        s->bi_valid = 0;\r
+    } else if (s->bi_valid >= 8) {\r
+        put_byte(s, (Byte)s->bi_buf);\r
+        s->bi_buf >>= 8;\r
+        s->bi_valid -= 8;\r
+    }\r
+}\r
+\r
+/* ===========================================================================\r
+ * Flush the bit buffer and align the output on a byte boundary\r
+ */\r
+local void bi_windup(s)\r
+    deflate_state *s;\r
+{\r
+    if (s->bi_valid > 8) {\r
+        put_short(s, s->bi_buf);\r
+    } else if (s->bi_valid > 0) {\r
+        put_byte(s, (Byte)s->bi_buf);\r
+    }\r
+    s->bi_buf = 0;\r
+    s->bi_valid = 0;\r
+#ifdef DEBUG\r
+    s->bits_sent = (s->bits_sent+7) & ~7;\r
+#endif\r
+}\r
+\r
+/* ===========================================================================\r
+ * Copy a stored block, storing first the length and its\r
+ * one's complement if requested.\r
+ */\r
+local void copy_block(s, buf, len, header)\r
+    deflate_state *s;\r
+    charf    *buf;    /* the input data */\r
+    unsigned len;     /* its length */\r
+    int      header;  /* true if block header must be written */\r
+{\r
+    bi_windup(s);        /* align on byte boundary */\r
+    s->last_eob_len = 8; /* enough lookahead for inflate */\r
+\r
+    if (header) {\r
+        put_short(s, (ush)len);\r
+        put_short(s, (ush)~len);\r
+#ifdef DEBUG\r
+        s->bits_sent += 2*16;\r
+#endif\r
+    }\r
+#ifdef DEBUG\r
+    s->bits_sent += (ulg)len<<3;\r
+#endif\r
+    while (len--) {\r
+        put_byte(s, *buf++);\r
+    }\r
+}\r
diff --git a/win32port/zlib/trees.h b/win32port/zlib/trees.h
new file mode 100644 (file)
index 0000000..ce8f620
--- /dev/null
@@ -0,0 +1,128 @@
+/* header created automatically with -DGEN_TREES_H */\r
+\r
+local const ct_data static_ltree[L_CODES+2] = {\r
+{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},\r
+{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},\r
+{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},\r
+{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},\r
+{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},\r
+{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},\r
+{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},\r
+{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},\r
+{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},\r
+{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},\r
+{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},\r
+{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},\r
+{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},\r
+{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},\r
+{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},\r
+{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},\r
+{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},\r
+{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},\r
+{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},\r
+{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},\r
+{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},\r
+{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},\r
+{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},\r
+{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},\r
+{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},\r
+{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},\r
+{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},\r
+{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},\r
+{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},\r
+{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},\r
+{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},\r
+{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},\r
+{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},\r
+{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},\r
+{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},\r
+{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},\r
+{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},\r
+{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},\r
+{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},\r
+{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},\r
+{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},\r
+{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},\r
+{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},\r
+{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},\r
+{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},\r
+{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},\r
+{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},\r
+{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},\r
+{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},\r
+{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},\r
+{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},\r
+{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},\r
+{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},\r
+{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},\r
+{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},\r
+{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},\r
+{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},\r
+{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}\r
+};\r
+\r
+local const ct_data static_dtree[D_CODES] = {\r
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},\r
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},\r
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},\r
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},\r
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},\r
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}\r
+};\r
+\r
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\r
+ 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,\r
+ 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,\r
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,\r
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,\r
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,\r
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,\r
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,\r
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,\r
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,\r
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,\r
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,\r
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,\r
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,\r
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,\r
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,\r
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,\r
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,\r
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,\r
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,\r
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,\r
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,\r
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,\r
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,\r
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,\r
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,\r
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29\r
+};\r
+\r
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\r
+ 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,\r
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,\r
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,\r
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,\r
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,\r
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,\r
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,\r
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,\r
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,\r
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,\r
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,\r
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,\r
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28\r
+};\r
+\r
+local const int base_length[LENGTH_CODES] = {\r
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,\r
+64, 80, 96, 112, 128, 160, 192, 224, 0\r
+};\r
+\r
+local const int base_dist[D_CODES] = {\r
+    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,\r
+   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,\r
+ 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576\r
+};\r
+\r
diff --git a/win32port/zlib/uncompr.c b/win32port/zlib/uncompr.c
new file mode 100644 (file)
index 0000000..f07773c
--- /dev/null
@@ -0,0 +1,59 @@
+/* uncompr.c -- decompress a memory buffer\r
+ * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#define ZLIB_INTERNAL\r
+#include "zlib.h"\r
+\r
+/* ===========================================================================\r
+     Decompresses the source buffer into the destination buffer.  sourceLen is\r
+   the byte length of the source buffer. Upon entry, destLen is the total\r
+   size of the destination buffer, which must be large enough to hold the\r
+   entire uncompressed data. (The size of the uncompressed data must have\r
+   been saved previously by the compressor and transmitted to the decompressor\r
+   by some mechanism outside the scope of this compression library.)\r
+   Upon exit, destLen is the actual size of the compressed buffer.\r
+\r
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not\r
+   enough memory, Z_BUF_ERROR if there was not enough room in the output\r
+   buffer, or Z_DATA_ERROR if the input data was corrupted.\r
+*/\r
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)\r
+    Bytef *dest;\r
+    uLongf *destLen;\r
+    const Bytef *source;\r
+    uLong sourceLen;\r
+{\r
+    z_stream stream;\r
+    int err;\r
+\r
+    stream.next_in = (Bytef*)source;\r
+    stream.avail_in = (uInt)sourceLen;\r
+    /* Check for source > 64K on 16-bit machine: */\r
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;\r
+\r
+    stream.next_out = dest;\r
+    stream.avail_out = (uInt)*destLen;\r
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;\r
+\r
+    stream.zalloc = (alloc_func)0;\r
+    stream.zfree = (free_func)0;\r
+\r
+    err = inflateInit(&stream);\r
+    if (err != Z_OK) return err;\r
+\r
+    err = inflate(&stream, Z_FINISH);\r
+    if (err != Z_STREAM_END) {\r
+        inflateEnd(&stream);\r
+        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))\r
+            return Z_DATA_ERROR;\r
+        return err;\r
+    }\r
+    *destLen = stream.total_out;\r
+\r
+    err = inflateEnd(&stream);\r
+    return err;\r
+}\r
diff --git a/win32port/zlib/zconf.h b/win32port/zlib/zconf.h
new file mode 100644 (file)
index 0000000..88f90f9
--- /dev/null
@@ -0,0 +1,428 @@
+/* zconf.h -- configuration of the zlib compression library\r
+ * Copyright (C) 1995-2010 Jean-loup Gailly.\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#ifndef ZCONF_H\r
+#define ZCONF_H\r
+\r
+/*\r
+ * If you *really* need a unique prefix for all types and library functions,\r
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.\r
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set\r
+ * this permanently in zconf.h using "./configure --zprefix".\r
+ */\r
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */\r
+\r
+/* all linked symbols */\r
+#  define _dist_code            z__dist_code\r
+#  define _length_code          z__length_code\r
+#  define _tr_align             z__tr_align\r
+#  define _tr_flush_block       z__tr_flush_block\r
+#  define _tr_init              z__tr_init\r
+#  define _tr_stored_block      z__tr_stored_block\r
+#  define _tr_tally             z__tr_tally\r
+#  define adler32               z_adler32\r
+#  define adler32_combine       z_adler32_combine\r
+#  define adler32_combine64     z_adler32_combine64\r
+#  define compress              z_compress\r
+#  define compress2             z_compress2\r
+#  define compressBound         z_compressBound\r
+#  define crc32                 z_crc32\r
+#  define crc32_combine         z_crc32_combine\r
+#  define crc32_combine64       z_crc32_combine64\r
+#  define deflate               z_deflate\r
+#  define deflateBound          z_deflateBound\r
+#  define deflateCopy           z_deflateCopy\r
+#  define deflateEnd            z_deflateEnd\r
+#  define deflateInit2_         z_deflateInit2_\r
+#  define deflateInit_          z_deflateInit_\r
+#  define deflateParams         z_deflateParams\r
+#  define deflatePrime          z_deflatePrime\r
+#  define deflateReset          z_deflateReset\r
+#  define deflateSetDictionary  z_deflateSetDictionary\r
+#  define deflateSetHeader      z_deflateSetHeader\r
+#  define deflateTune           z_deflateTune\r
+#  define deflate_copyright     z_deflate_copyright\r
+#  define get_crc_table         z_get_crc_table\r
+#  define gz_error              z_gz_error\r
+#  define gz_intmax             z_gz_intmax\r
+#  define gz_strwinerror        z_gz_strwinerror\r
+#  define gzbuffer              z_gzbuffer\r
+#  define gzclearerr            z_gzclearerr\r
+#  define gzclose               z_gzclose\r
+#  define gzclose_r             z_gzclose_r\r
+#  define gzclose_w             z_gzclose_w\r
+#  define gzdirect              z_gzdirect\r
+#  define gzdopen               z_gzdopen\r
+#  define gzeof                 z_gzeof\r
+#  define gzerror               z_gzerror\r
+#  define gzflush               z_gzflush\r
+#  define gzgetc                z_gzgetc\r
+#  define gzgets                z_gzgets\r
+#  define gzoffset              z_gzoffset\r
+#  define gzoffset64            z_gzoffset64\r
+#  define gzopen                z_gzopen\r
+#  define gzopen64              z_gzopen64\r
+#  define gzprintf              z_gzprintf\r
+#  define gzputc                z_gzputc\r
+#  define gzputs                z_gzputs\r
+#  define gzread                z_gzread\r
+#  define gzrewind              z_gzrewind\r
+#  define gzseek                z_gzseek\r
+#  define gzseek64              z_gzseek64\r
+#  define gzsetparams           z_gzsetparams\r
+#  define gztell                z_gztell\r
+#  define gztell64              z_gztell64\r
+#  define gzungetc              z_gzungetc\r
+#  define gzwrite               z_gzwrite\r
+#  define inflate               z_inflate\r
+#  define inflateBack           z_inflateBack\r
+#  define inflateBackEnd        z_inflateBackEnd\r
+#  define inflateBackInit_      z_inflateBackInit_\r
+#  define inflateCopy           z_inflateCopy\r
+#  define inflateEnd            z_inflateEnd\r
+#  define inflateGetHeader      z_inflateGetHeader\r
+#  define inflateInit2_         z_inflateInit2_\r
+#  define inflateInit_          z_inflateInit_\r
+#  define inflateMark           z_inflateMark\r
+#  define inflatePrime          z_inflatePrime\r
+#  define inflateReset          z_inflateReset\r
+#  define inflateReset2         z_inflateReset2\r
+#  define inflateSetDictionary  z_inflateSetDictionary\r
+#  define inflateSync           z_inflateSync\r
+#  define inflateSyncPoint      z_inflateSyncPoint\r
+#  define inflateUndermine      z_inflateUndermine\r
+#  define inflate_copyright     z_inflate_copyright\r
+#  define inflate_fast          z_inflate_fast\r
+#  define inflate_table         z_inflate_table\r
+#  define uncompress            z_uncompress\r
+#  define zError                z_zError\r
+#  define zcalloc               z_zcalloc\r
+#  define zcfree                z_zcfree\r
+#  define zlibCompileFlags      z_zlibCompileFlags\r
+#  define zlibVersion           z_zlibVersion\r
+\r
+/* all zlib typedefs in zlib.h and zconf.h */\r
+#  define Byte                  z_Byte\r
+#  define Bytef                 z_Bytef\r
+#  define alloc_func            z_alloc_func\r
+#  define charf                 z_charf\r
+#  define free_func             z_free_func\r
+#  define gzFile                z_gzFile\r
+#  define gz_header             z_gz_header\r
+#  define gz_headerp            z_gz_headerp\r
+#  define in_func               z_in_func\r
+#  define intf                  z_intf\r
+#  define out_func              z_out_func\r
+#  define uInt                  z_uInt\r
+#  define uIntf                 z_uIntf\r
+#  define uLong                 z_uLong\r
+#  define uLongf                z_uLongf\r
+#  define voidp                 z_voidp\r
+#  define voidpc                z_voidpc\r
+#  define voidpf                z_voidpf\r
+\r
+/* all zlib structs in zlib.h and zconf.h */\r
+#  define gz_header_s           z_gz_header_s\r
+#  define internal_state        z_internal_state\r
+\r
+#endif\r
+\r
+#if defined(__MSDOS__) && !defined(MSDOS)\r
+#  define MSDOS\r
+#endif\r
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)\r
+#  define OS2\r
+#endif\r
+#if defined(_WINDOWS) && !defined(WINDOWS)\r
+#  define WINDOWS\r
+#endif\r
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)\r
+#  ifndef WIN32\r
+#    define WIN32\r
+#  endif\r
+#endif\r
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)\r
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)\r
+#    ifndef SYS16BIT\r
+#      define SYS16BIT\r
+#    endif\r
+#  endif\r
+#endif\r
+\r
+/*\r
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more\r
+ * than 64k bytes at a time (needed on systems with 16-bit int).\r
+ */\r
+#ifdef SYS16BIT\r
+#  define MAXSEG_64K\r
+#endif\r
+#ifdef MSDOS\r
+#  define UNALIGNED_OK\r
+#endif\r
+\r
+#ifdef __STDC_VERSION__\r
+#  ifndef STDC\r
+#    define STDC\r
+#  endif\r
+#  if __STDC_VERSION__ >= 199901L\r
+#    ifndef STDC99\r
+#      define STDC99\r
+#    endif\r
+#  endif\r
+#endif\r
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))\r
+#  define STDC\r
+#endif\r
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))\r
+#  define STDC\r
+#endif\r
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))\r
+#  define STDC\r
+#endif\r
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))\r
+#  define STDC\r
+#endif\r
+\r
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */\r
+#  define STDC\r
+#endif\r
+\r
+#ifndef STDC\r
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */\r
+#    define const       /* note: need a more gentle solution here */\r
+#  endif\r
+#endif\r
+\r
+/* Some Mac compilers merge all .h files incorrectly: */\r
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)\r
+#  define NO_DUMMY_DECL\r
+#endif\r
+\r
+/* Maximum value for memLevel in deflateInit2 */\r
+#ifndef MAX_MEM_LEVEL\r
+#  ifdef MAXSEG_64K\r
+#    define MAX_MEM_LEVEL 8\r
+#  else\r
+#    define MAX_MEM_LEVEL 9\r
+#  endif\r
+#endif\r
+\r
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.\r
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files\r
+ * created by gzip. (Files created by minigzip can still be extracted by\r
+ * gzip.)\r
+ */\r
+#ifndef MAX_WBITS\r
+#  define MAX_WBITS   15 /* 32K LZ77 window */\r
+#endif\r
+\r
+/* The memory requirements for deflate are (in bytes):\r
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))\r
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)\r
+ plus a few kilobytes for small objects. For example, if you want to reduce\r
+ the default memory requirements from 256K to 128K, compile with\r
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"\r
+ Of course this will generally degrade compression (there's no free lunch).\r
+\r
+   The memory requirements for inflate are (in bytes) 1 << windowBits\r
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes\r
+ for small objects.\r
+*/\r
+\r
+                        /* Type declarations */\r
+\r
+#ifndef OF /* function prototypes */\r
+#  ifdef STDC\r
+#    define OF(args)  args\r
+#  else\r
+#    define OF(args)  ()\r
+#  endif\r
+#endif\r
+\r
+/* The following definitions for FAR are needed only for MSDOS mixed\r
+ * model programming (small or medium model with some far allocations).\r
+ * This was tested only with MSC; for other MSDOS compilers you may have\r
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,\r
+ * just define FAR to be empty.\r
+ */\r
+#ifdef SYS16BIT\r
+#  if defined(M_I86SM) || defined(M_I86MM)\r
+     /* MSC small or medium model */\r
+#    define SMALL_MEDIUM\r
+#    ifdef _MSC_VER\r
+#      define FAR _far\r
+#    else\r
+#      define FAR far\r
+#    endif\r
+#  endif\r
+#  if (defined(__SMALL__) || defined(__MEDIUM__))\r
+     /* Turbo C small or medium model */\r
+#    define SMALL_MEDIUM\r
+#    ifdef __BORLANDC__\r
+#      define FAR _far\r
+#    else\r
+#      define FAR far\r
+#    endif\r
+#  endif\r
+#endif\r
+\r
+#if defined(WINDOWS) || defined(WIN32)\r
+   /* If building or using zlib as a DLL, define ZLIB_DLL.\r
+    * This is not mandatory, but it offers a little performance increase.\r
+    */\r
+#  ifdef ZLIB_DLL\r
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))\r
+#      ifdef ZLIB_INTERNAL\r
+#        define ZEXTERN extern __declspec(dllexport)\r
+#      else\r
+#        define ZEXTERN extern __declspec(dllimport)\r
+#      endif\r
+#    endif\r
+#  endif  /* ZLIB_DLL */\r
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,\r
+    * define ZLIB_WINAPI.\r
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.\r
+    */\r
+#  ifdef ZLIB_WINAPI\r
+#    ifdef FAR\r
+#      undef FAR\r
+#    endif\r
+#    include <windows.h>\r
+     /* No need for _export, use ZLIB.DEF instead. */\r
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */\r
+#    define ZEXPORT WINAPI\r
+#    ifdef WIN32\r
+#      define ZEXPORTVA WINAPIV\r
+#    else\r
+#      define ZEXPORTVA FAR CDECL\r
+#    endif\r
+#  endif\r
+#endif\r
+\r
+#if defined (__BEOS__)\r
+#  ifdef ZLIB_DLL\r
+#    ifdef ZLIB_INTERNAL\r
+#      define ZEXPORT   __declspec(dllexport)\r
+#      define ZEXPORTVA __declspec(dllexport)\r
+#    else\r
+#      define ZEXPORT   __declspec(dllimport)\r
+#      define ZEXPORTVA __declspec(dllimport)\r
+#    endif\r
+#  endif\r
+#endif\r
+\r
+#ifndef ZEXTERN\r
+#  define ZEXTERN extern\r
+#endif\r
+#ifndef ZEXPORT\r
+#  define ZEXPORT\r
+#endif\r
+#ifndef ZEXPORTVA\r
+#  define ZEXPORTVA\r
+#endif\r
+\r
+#ifndef FAR\r
+#  define FAR\r
+#endif\r
+\r
+#if !defined(__MACTYPES__)\r
+typedef unsigned char  Byte;  /* 8 bits */\r
+#endif\r
+typedef unsigned int   uInt;  /* 16 bits or more */\r
+typedef unsigned long  uLong; /* 32 bits or more */\r
+\r
+#ifdef SMALL_MEDIUM\r
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */\r
+#  define Bytef Byte FAR\r
+#else\r
+   typedef Byte  FAR Bytef;\r
+#endif\r
+typedef char  FAR charf;\r
+typedef int   FAR intf;\r
+typedef uInt  FAR uIntf;\r
+typedef uLong FAR uLongf;\r
+\r
+#ifdef STDC\r
+   typedef void const *voidpc;\r
+   typedef void FAR   *voidpf;\r
+   typedef void       *voidp;\r
+#else\r
+   typedef Byte const *voidpc;\r
+   typedef Byte FAR   *voidpf;\r
+   typedef Byte       *voidp;\r
+#endif\r
+\r
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */\r
+#  define Z_HAVE_UNISTD_H\r
+#endif\r
+\r
+#ifdef STDC\r
+#  include <sys/types.h>    /* for off_t */\r
+#endif\r
+\r
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and\r
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even\r
+ * though the former does not conform to the LFS document), but considering\r
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as\r
+ * equivalently requesting no 64-bit operations\r
+ */\r
+#if -_LARGEFILE64_SOURCE - -1 == 1\r
+#  undef _LARGEFILE64_SOURCE\r
+#endif\r
+\r
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)\r
+#  include <unistd.h>       /* for SEEK_* and off_t */\r
+#  ifdef VMS\r
+#    include <unixio.h>     /* for off_t */\r
+#  endif\r
+#  ifndef z_off_t\r
+#    define z_off_t off_t\r
+#  endif\r
+#endif\r
+\r
+#ifndef SEEK_SET\r
+#  define SEEK_SET        0       /* Seek from beginning of file.  */\r
+#  define SEEK_CUR        1       /* Seek from current position.  */\r
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */\r
+#endif\r
+\r
+#ifndef z_off_t\r
+#  define z_off_t long\r
+#endif\r
+\r
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0\r
+#  define z_off64_t off64_t\r
+#else\r
+#  define z_off64_t z_off_t\r
+#endif\r
+\r
+#if defined(__OS400__)\r
+#  define NO_vsnprintf\r
+#endif\r
+\r
+#if defined(__MVS__)\r
+#  define NO_vsnprintf\r
+#endif\r
+\r
+/* MVS linker does not support external names larger than 8 bytes */\r
+#if defined(__MVS__)\r
+  #pragma map(deflateInit_,"DEIN")\r
+  #pragma map(deflateInit2_,"DEIN2")\r
+  #pragma map(deflateEnd,"DEEND")\r
+  #pragma map(deflateBound,"DEBND")\r
+  #pragma map(inflateInit_,"ININ")\r
+  #pragma map(inflateInit2_,"ININ2")\r
+  #pragma map(inflateEnd,"INEND")\r
+  #pragma map(inflateSync,"INSY")\r
+  #pragma map(inflateSetDictionary,"INSEDI")\r
+  #pragma map(compressBound,"CMBND")\r
+  #pragma map(inflate_table,"INTABL")\r
+  #pragma map(inflate_fast,"INFA")\r
+  #pragma map(inflate_copyright,"INCOPY")\r
+#endif\r
+\r
+#endif /* ZCONF_H */\r
diff --git a/win32port/zlib/zlib.h b/win32port/zlib/zlib.h
new file mode 100644 (file)
index 0000000..cba7ab2
--- /dev/null
@@ -0,0 +1,1613 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library\r
+  version 1.2.5, April 19th, 2010\r
+\r
+  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler\r
+\r
+  This software is provided 'as-is', without any express or implied\r
+  warranty.  In no event will the authors be held liable for any damages\r
+  arising from the use of this software.\r
+\r
+  Permission is granted to anyone to use this software for any purpose,\r
+  including commercial applications, and to alter it and redistribute it\r
+  freely, subject to the following restrictions:\r
+\r
+  1. The origin of this software must not be misrepresented; you must not\r
+     claim that you wrote the original software. If you use this software\r
+     in a product, an acknowledgment in the product documentation would be\r
+     appreciated but is not required.\r
+  2. Altered source versions must be plainly marked as such, and must not be\r
+     misrepresented as being the original software.\r
+  3. This notice may not be removed or altered from any source distribution.\r
+\r
+  Jean-loup Gailly        Mark Adler\r
+  jloup@gzip.org          madler@alumni.caltech.edu\r
+\r
+\r
+  The data format used by the zlib library is described by RFCs (Request for\r
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt\r
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).\r
+*/\r
+\r
+#ifndef ZLIB_H\r
+#define ZLIB_H\r
+\r
+#include "zconf.h"\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+\r
+#define ZLIB_VERSION "1.2.5"\r
+#define ZLIB_VERNUM 0x1250\r
+#define ZLIB_VER_MAJOR 1\r
+#define ZLIB_VER_MINOR 2\r
+#define ZLIB_VER_REVISION 5\r
+#define ZLIB_VER_SUBREVISION 0\r
+\r
+/*\r
+    The 'zlib' compression library provides in-memory compression and\r
+  decompression functions, including integrity checks of the uncompressed data.\r
+  This version of the library supports only one compression method (deflation)\r
+  but other algorithms will be added later and will have the same stream\r
+  interface.\r
+\r
+    Compression can be done in a single step if the buffers are large enough,\r
+  or can be done by repeated calls of the compression function.  In the latter\r
+  case, the application must provide more input and/or consume the output\r
+  (providing more output space) before each call.\r
+\r
+    The compressed data format used by default by the in-memory functions is\r
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped\r
+  around a deflate stream, which is itself documented in RFC 1951.\r
+\r
+    The library also supports reading and writing files in gzip (.gz) format\r
+  with an interface similar to that of stdio using the functions that start\r
+  with "gz".  The gzip format is different from the zlib format.  gzip is a\r
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.\r
+\r
+    This library can optionally read and write gzip streams in memory as well.\r
+\r
+    The zlib format was designed to be compact and fast for use in memory\r
+  and on communications channels.  The gzip format was designed for single-\r
+  file compression on file systems, has a larger header than zlib to maintain\r
+  directory information, and uses a different, slower check method than zlib.\r
+\r
+    The library does not install any signal handler.  The decoder checks\r
+  the consistency of the compressed data, so the library should never crash\r
+  even in case of corrupted input.\r
+*/\r
+\r
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));\r
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));\r
+\r
+struct internal_state;\r
+\r
+typedef struct z_stream_s {\r
+    Bytef    *next_in;  /* next input byte */\r
+    uInt     avail_in;  /* number of bytes available at next_in */\r
+    uLong    total_in;  /* total nb of input bytes read so far */\r
+\r
+    Bytef    *next_out; /* next output byte should be put there */\r
+    uInt     avail_out; /* remaining free space at next_out */\r
+    uLong    total_out; /* total nb of bytes output so far */\r
+\r
+    char     *msg;      /* last error message, NULL if no error */\r
+    struct internal_state FAR *state; /* not visible by applications */\r
+\r
+    alloc_func zalloc;  /* used to allocate the internal state */\r
+    free_func  zfree;   /* used to free the internal state */\r
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */\r
+\r
+    int     data_type;  /* best guess about the data type: binary or text */\r
+    uLong   adler;      /* adler32 value of the uncompressed data */\r
+    uLong   reserved;   /* reserved for future use */\r
+} z_stream;\r
+\r
+typedef z_stream FAR *z_streamp;\r
+\r
+/*\r
+     gzip header information passed to and from zlib routines.  See RFC 1952\r
+  for more details on the meanings of these fields.\r
+*/\r
+typedef struct gz_header_s {\r
+    int     text;       /* true if compressed data believed to be text */\r
+    uLong   time;       /* modification time */\r
+    int     xflags;     /* extra flags (not used when writing a gzip file) */\r
+    int     os;         /* operating system */\r
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */\r
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */\r
+    uInt    extra_max;  /* space at extra (only when reading header) */\r
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */\r
+    uInt    name_max;   /* space at name (only when reading header) */\r
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */\r
+    uInt    comm_max;   /* space at comment (only when reading header) */\r
+    int     hcrc;       /* true if there was or will be a header crc */\r
+    int     done;       /* true when done reading gzip header (not used\r
+                           when writing a gzip file) */\r
+} gz_header;\r
+\r
+typedef gz_header FAR *gz_headerp;\r
+\r
+/*\r
+     The application must update next_in and avail_in when avail_in has dropped\r
+   to zero.  It must update next_out and avail_out when avail_out has dropped\r
+   to zero.  The application must initialize zalloc, zfree and opaque before\r
+   calling the init function.  All other fields are set by the compression\r
+   library and must not be updated by the application.\r
+\r
+     The opaque value provided by the application will be passed as the first\r
+   parameter for calls of zalloc and zfree.  This can be useful for custom\r
+   memory management.  The compression library attaches no meaning to the\r
+   opaque value.\r
+\r
+     zalloc must return Z_NULL if there is not enough memory for the object.\r
+   If zlib is used in a multi-threaded application, zalloc and zfree must be\r
+   thread safe.\r
+\r
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate\r
+   exactly 65536 bytes, but will not be required to allocate more than this if\r
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers\r
+   returned by zalloc for objects of exactly 65536 bytes *must* have their\r
+   offset normalized to zero.  The default allocation function provided by this\r
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid\r
+   any allocation of 64K objects, at the expense of compression ratio, compile\r
+   the library with -DMAX_WBITS=14 (see zconf.h).\r
+\r
+     The fields total_in and total_out can be used for statistics or progress\r
+   reports.  After compression, total_in holds the total size of the\r
+   uncompressed data and may be saved for use in the decompressor (particularly\r
+   if the decompressor wants to decompress everything in a single step).\r
+*/\r
+\r
+                        /* constants */\r
+\r
+#define Z_NO_FLUSH      0\r
+#define Z_PARTIAL_FLUSH 1\r
+#define Z_SYNC_FLUSH    2\r
+#define Z_FULL_FLUSH    3\r
+#define Z_FINISH        4\r
+#define Z_BLOCK         5\r
+#define Z_TREES         6\r
+/* Allowed flush values; see deflate() and inflate() below for details */\r
+\r
+#define Z_OK            0\r
+#define Z_STREAM_END    1\r
+#define Z_NEED_DICT     2\r
+#define Z_ERRNO        (-1)\r
+#define Z_STREAM_ERROR (-2)\r
+#define Z_DATA_ERROR   (-3)\r
+#define Z_MEM_ERROR    (-4)\r
+#define Z_BUF_ERROR    (-5)\r
+#define Z_VERSION_ERROR (-6)\r
+/* Return codes for the compression/decompression functions. Negative values\r
+ * are errors, positive values are used for special but normal events.\r
+ */\r
+\r
+#define Z_NO_COMPRESSION         0\r
+#define Z_BEST_SPEED             1\r
+#define Z_BEST_COMPRESSION       9\r
+#define Z_DEFAULT_COMPRESSION  (-1)\r
+/* compression levels */\r
+\r
+#define Z_FILTERED            1\r
+#define Z_HUFFMAN_ONLY        2\r
+#define Z_RLE                 3\r
+#define Z_FIXED               4\r
+#define Z_DEFAULT_STRATEGY    0\r
+/* compression strategy; see deflateInit2() below for details */\r
+\r
+#define Z_BINARY   0\r
+#define Z_TEXT     1\r
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */\r
+#define Z_UNKNOWN  2\r
+/* Possible values of the data_type field (though see inflate()) */\r
+\r
+#define Z_DEFLATED   8\r
+/* The deflate compression method (the only one supported in this version) */\r
+\r
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */\r
+\r
+#define zlib_version zlibVersion()\r
+/* for compatibility with versions < 1.0.2 */\r
+\r
+\r
+                        /* basic functions */\r
+\r
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));\r
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.\r
+   If the first character differs, the library code actually used is not\r
+   compatible with the zlib.h header file used by the application.  This check\r
+   is automatically made by deflateInit and inflateInit.\r
+ */\r
+\r
+/*\r
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));\r
+\r
+     Initializes the internal stream state for compression.  The fields\r
+   zalloc, zfree and opaque must be initialized before by the caller.  If\r
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default\r
+   allocation functions.\r
+\r
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:\r
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all\r
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION\r
+   requests a default compromise between speed and compression (currently\r
+   equivalent to level 6).\r
+\r
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough\r
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or\r
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible\r
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null\r
+   if there is no error message.  deflateInit does not perform any compression:\r
+   this will be done by deflate().\r
+*/\r
+\r
+\r
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));\r
+/*\r
+    deflate compresses as much data as possible, and stops when the input\r
+  buffer becomes empty or the output buffer becomes full.  It may introduce\r
+  some output latency (reading input without producing any output) except when\r
+  forced to flush.\r
+\r
+    The detailed semantics are as follows.  deflate performs one or both of the\r
+  following actions:\r
+\r
+  - Compress more input starting at next_in and update next_in and avail_in\r
+    accordingly.  If not all input can be processed (because there is not\r
+    enough room in the output buffer), next_in and avail_in are updated and\r
+    processing will resume at this point for the next call of deflate().\r
+\r
+  - Provide more output starting at next_out and update next_out and avail_out\r
+    accordingly.  This action is forced if the parameter flush is non zero.\r
+    Forcing flush frequently degrades the compression ratio, so this parameter\r
+    should be set only when necessary (in interactive applications).  Some\r
+    output may be provided even if flush is not set.\r
+\r
+    Before the call of deflate(), the application should ensure that at least\r
+  one of the actions is possible, by providing more input and/or consuming more\r
+  output, and updating avail_in or avail_out accordingly; avail_out should\r
+  never be zero before the call.  The application can consume the compressed\r
+  output when it wants, for example when the output buffer is full (avail_out\r
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with\r
+  zero avail_out, it must be called again after making room in the output\r
+  buffer because there might be more output pending.\r
+\r
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to\r
+  decide how much data to accumulate before producing output, in order to\r
+  maximize compression.\r
+\r
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is\r
+  flushed to the output buffer and the output is aligned on a byte boundary, so\r
+  that the decompressor can get all input data available so far.  (In\r
+  particular avail_in is zero after the call if enough output space has been\r
+  provided before the call.) Flushing may degrade compression for some\r
+  compression algorithms and so it should be used only when necessary.  This\r
+  completes the current deflate block and follows it with an empty stored block\r
+  that is three bits plus filler bits to the next byte, followed by four bytes\r
+  (00 00 ff ff).\r
+\r
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the\r
+  output buffer, but the output is not aligned to a byte boundary.  All of the\r
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.\r
+  This completes the current deflate block and follows it with an empty fixed\r
+  codes block that is 10 bits long.  This assures that enough bytes are output\r
+  in order for the decompressor to finish the block before the empty fixed code\r
+  block.\r
+\r
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as\r
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to\r
+  seven bits of the current block are held to be written as the next byte after\r
+  the next deflate block is completed.  In this case, the decompressor may not\r
+  be provided enough bits at this point in order to complete decompression of\r
+  the data provided so far to the compressor.  It may need to wait for the next\r
+  block to be emitted.  This is for advanced applications that need to control\r
+  the emission of deflate blocks.\r
+\r
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with\r
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can\r
+  restart from this point if previous compressed data has been damaged or if\r
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade\r
+  compression.\r
+\r
+    If deflate returns with avail_out == 0, this function must be called again\r
+  with the same value of the flush parameter and more output space (updated\r
+  avail_out), until the flush is complete (deflate returns with non-zero\r
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that\r
+  avail_out is greater than six to avoid repeated flush markers due to\r
+  avail_out == 0 on return.\r
+\r
+    If the parameter flush is set to Z_FINISH, pending input is processed,\r
+  pending output is flushed and deflate returns with Z_STREAM_END if there was\r
+  enough output space; if deflate returns with Z_OK, this function must be\r
+  called again with Z_FINISH and more output space (updated avail_out) but no\r
+  more input data, until it returns with Z_STREAM_END or an error.  After\r
+  deflate has returned Z_STREAM_END, the only possible operations on the stream\r
+  are deflateReset or deflateEnd.\r
+\r
+    Z_FINISH can be used immediately after deflateInit if all the compression\r
+  is to be done in a single step.  In this case, avail_out must be at least the\r
+  value returned by deflateBound (see below).  If deflate does not return\r
+  Z_STREAM_END, then it must be called again as described above.\r
+\r
+    deflate() sets strm->adler to the adler32 checksum of all input read\r
+  so far (that is, total_in bytes).\r
+\r
+    deflate() may update strm->data_type if it can make a good guess about\r
+  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered\r
+  binary.  This field is only for information purposes and does not affect the\r
+  compression algorithm in any manner.\r
+\r
+    deflate() returns Z_OK if some progress has been made (more input\r
+  processed or more output produced), Z_STREAM_END if all input has been\r
+  consumed and all output has been produced (only when flush is set to\r
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example\r
+  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible\r
+  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not\r
+  fatal, and deflate() can be called again with more input and more output\r
+  space to continue compressing.\r
+*/\r
+\r
+\r
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));\r
+/*\r
+     All dynamically allocated data structures for this stream are freed.\r
+   This function discards any unprocessed input and does not flush any pending\r
+   output.\r
+\r
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the\r
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed\r
+   prematurely (some input or output was discarded).  In the error case, msg\r
+   may be set but then points to a static string (which must not be\r
+   deallocated).\r
+*/\r
+\r
+\r
+/*\r
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));\r
+\r
+     Initializes the internal stream state for decompression.  The fields\r
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by\r
+   the caller.  If next_in is not Z_NULL and avail_in is large enough (the\r
+   exact value depends on the compression method), inflateInit determines the\r
+   compression method from the zlib header and allocates all data structures\r
+   accordingly; otherwise the allocation will be deferred to the first call of\r
+   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to\r
+   use default allocation functions.\r
+\r
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough\r
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the\r
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are\r
+   invalid, such as a null pointer to the structure.  msg is set to null if\r
+   there is no error message.  inflateInit does not perform any decompression\r
+   apart from possibly reading the zlib header if present: actual decompression\r
+   will be done by inflate().  (So next_in and avail_in may be modified, but\r
+   next_out and avail_out are unused and unchanged.) The current implementation\r
+   of inflateInit() does not process any header information -- that is deferred\r
+   until inflate() is called.\r
+*/\r
+\r
+\r
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));\r
+/*\r
+    inflate decompresses as much data as possible, and stops when the input\r
+  buffer becomes empty or the output buffer becomes full.  It may introduce\r
+  some output latency (reading input without producing any output) except when\r
+  forced to flush.\r
+\r
+  The detailed semantics are as follows.  inflate performs one or both of the\r
+  following actions:\r
+\r
+  - Decompress more input starting at next_in and update next_in and avail_in\r
+    accordingly.  If not all input can be processed (because there is not\r
+    enough room in the output buffer), next_in is updated and processing will\r
+    resume at this point for the next call of inflate().\r
+\r
+  - Provide more output starting at next_out and update next_out and avail_out\r
+    accordingly.  inflate() provides as much output as possible, until there is\r
+    no more input data or no more space in the output buffer (see below about\r
+    the flush parameter).\r
+\r
+    Before the call of inflate(), the application should ensure that at least\r
+  one of the actions is possible, by providing more input and/or consuming more\r
+  output, and updating the next_* and avail_* values accordingly.  The\r
+  application can consume the uncompressed output when it wants, for example\r
+  when the output buffer is full (avail_out == 0), or after each call of\r
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be\r
+  called again after making room in the output buffer because there might be\r
+  more output pending.\r
+\r
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,\r
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much\r
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()\r
+  stop if and when it gets to the next deflate block boundary.  When decoding\r
+  the zlib or gzip format, this will cause inflate() to return immediately\r
+  after the header and before the first block.  When doing a raw inflate,\r
+  inflate() will go ahead and process the first block, and will return when it\r
+  gets to the end of that block, or when it runs out of data.\r
+\r
+    The Z_BLOCK option assists in appending to or combining deflate streams.\r
+  Also to assist in this, on return inflate() will set strm->data_type to the\r
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if\r
+  inflate() is currently decoding the last block in the deflate stream, plus\r
+  128 if inflate() returned immediately after decoding an end-of-block code or\r
+  decoding the complete header up to just before the first byte of the deflate\r
+  stream.  The end-of-block will not be indicated until all of the uncompressed\r
+  data from that block has been written to strm->next_out.  The number of\r
+  unused bits may in general be greater than seven, except when bit 7 of\r
+  data_type is set, in which case the number of unused bits will be less than\r
+  eight.  data_type is set as noted here every time inflate() returns for all\r
+  flush options, and so can be used to determine the amount of currently\r
+  consumed input in bits.\r
+\r
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the\r
+  end of each deflate block header is reached, before any actual data in that\r
+  block is decoded.  This allows the caller to determine the length of the\r
+  deflate block header for later use in random access within a deflate block.\r
+  256 is added to the value of strm->data_type when inflate() returns\r
+  immediately after reaching the end of the deflate block header.\r
+\r
+    inflate() should normally be called until it returns Z_STREAM_END or an\r
+  error.  However if all decompression is to be performed in a single step (a\r
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In\r
+  this case all pending input is processed and all pending output is flushed;\r
+  avail_out must be large enough to hold all the uncompressed data.  (The size\r
+  of the uncompressed data may have been saved by the compressor for this\r
+  purpose.) The next operation on this stream must be inflateEnd to deallocate\r
+  the decompression state.  The use of Z_FINISH is never required, but can be\r
+  used to inform inflate that a faster approach may be used for the single\r
+  inflate() call.\r
+\r
+     In this implementation, inflate() always flushes as much output as\r
+  possible to the output buffer, and always uses the faster approach on the\r
+  first call.  So the only effect of the flush parameter in this implementation\r
+  is on the return value of inflate(), as noted below, or when it returns early\r
+  because Z_BLOCK or Z_TREES is used.\r
+\r
+     If a preset dictionary is needed after this call (see inflateSetDictionary\r
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary\r
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets\r
+  strm->adler to the adler32 checksum of all output produced so far (that is,\r
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described\r
+  below.  At the end of the stream, inflate() checks that its computed adler32\r
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END\r
+  only if the checksum is correct.\r
+\r
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped\r
+  deflate data.  The header type is detected automatically, if requested when\r
+  initializing with inflateInit2().  Any information contained in the gzip\r
+  header is not retained, so applications that need that information should\r
+  instead use raw inflate, see inflateInit2() below, or inflateBack() and\r
+  perform their own processing of the gzip header and trailer.\r
+\r
+    inflate() returns Z_OK if some progress has been made (more input processed\r
+  or more output produced), Z_STREAM_END if the end of the compressed data has\r
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a\r
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was\r
+  corrupted (input stream not conforming to the zlib format or incorrect check\r
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example\r
+  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,\r
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the\r
+  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and\r
+  inflate() can be called again with more input and more output space to\r
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may\r
+  then call inflateSync() to look for a good compression block if a partial\r
+  recovery of the data is desired.\r
+*/\r
+\r
+\r
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));\r
+/*\r
+     All dynamically allocated data structures for this stream are freed.\r
+   This function discards any unprocessed input and does not flush any pending\r
+   output.\r
+\r
+     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state\r
+   was inconsistent.  In the error case, msg may be set but then points to a\r
+   static string (which must not be deallocated).\r
+*/\r
+\r
+\r
+                        /* Advanced functions */\r
+\r
+/*\r
+    The following functions are needed only in some special applications.\r
+*/\r
+\r
+/*\r
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,\r
+                                     int  level,\r
+                                     int  method,\r
+                                     int  windowBits,\r
+                                     int  memLevel,\r
+                                     int  strategy));\r
+\r
+     This is another version of deflateInit with more compression options.  The\r
+   fields next_in, zalloc, zfree and opaque must be initialized before by the\r
+   caller.\r
+\r
+     The method parameter is the compression method.  It must be Z_DEFLATED in\r
+   this version of the library.\r
+\r
+     The windowBits parameter is the base two logarithm of the window size\r
+   (the size of the history buffer).  It should be in the range 8..15 for this\r
+   version of the library.  Larger values of this parameter result in better\r
+   compression at the expense of memory usage.  The default value is 15 if\r
+   deflateInit is used instead.\r
+\r
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits\r
+   determines the window size.  deflate() will then generate raw deflate data\r
+   with no zlib header or trailer, and will not compute an adler32 check value.\r
+\r
+     windowBits can also be greater than 15 for optional gzip encoding.  Add\r
+   16 to windowBits to write a simple gzip header and trailer around the\r
+   compressed data instead of a zlib wrapper.  The gzip header will have no\r
+   file name, no extra data, no comment, no modification time (set to zero), no\r
+   header crc, and the operating system will be set to 255 (unknown).  If a\r
+   gzip stream is being written, strm->adler is a crc32 instead of an adler32.\r
+\r
+     The memLevel parameter specifies how much memory should be allocated\r
+   for the internal compression state.  memLevel=1 uses minimum memory but is\r
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for\r
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage\r
+   as a function of windowBits and memLevel.\r
+\r
+     The strategy parameter is used to tune the compression algorithm.  Use the\r
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a\r
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no\r
+   string match), or Z_RLE to limit match distances to one (run-length\r
+   encoding).  Filtered data consists mostly of small values with a somewhat\r
+   random distribution.  In this case, the compression algorithm is tuned to\r
+   compress them better.  The effect of Z_FILTERED is to force more Huffman\r
+   coding and less string matching; it is somewhat intermediate between\r
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as\r
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The\r
+   strategy parameter only affects the compression ratio but not the\r
+   correctness of the compressed output even if it is not set appropriately.\r
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler\r
+   decoder for special applications.\r
+\r
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough\r
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid\r
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is\r
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is\r
+   set to null if there is no error message.  deflateInit2 does not perform any\r
+   compression: this will be done by deflate().\r
+*/\r
+\r
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,\r
+                                             const Bytef *dictionary,\r
+                                             uInt  dictLength));\r
+/*\r
+     Initializes the compression dictionary from the given byte sequence\r
+   without producing any compressed output.  This function must be called\r
+   immediately after deflateInit, deflateInit2 or deflateReset, before any call\r
+   of deflate.  The compressor and decompressor must use exactly the same\r
+   dictionary (see inflateSetDictionary).\r
+\r
+     The dictionary should consist of strings (byte sequences) that are likely\r
+   to be encountered later in the data to be compressed, with the most commonly\r
+   used strings preferably put towards the end of the dictionary.  Using a\r
+   dictionary is most useful when the data to be compressed is short and can be\r
+   predicted with good accuracy; the data can then be compressed better than\r
+   with the default empty dictionary.\r
+\r
+     Depending on the size of the compression data structures selected by\r
+   deflateInit or deflateInit2, a part of the dictionary may in effect be\r
+   discarded, for example if the dictionary is larger than the window size\r
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be\r
+   useful should be put at the end of the dictionary, not at the front.  In\r
+   addition, the current implementation of deflate will use at most the window\r
+   size minus 262 bytes of the provided dictionary.\r
+\r
+     Upon return of this function, strm->adler is set to the adler32 value\r
+   of the dictionary; the decompressor may later use this value to determine\r
+   which dictionary has been used by the compressor.  (The adler32 value\r
+   applies to the whole dictionary even if only a subset of the dictionary is\r
+   actually used by the compressor.) If a raw deflate was requested, then the\r
+   adler32 value is not computed and strm->adler is not set.\r
+\r
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a\r
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is\r
+   inconsistent (for example if deflate has already been called for this stream\r
+   or if the compression method is bsort).  deflateSetDictionary does not\r
+   perform any compression: this will be done by deflate().\r
+*/\r
+\r
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,\r
+                                    z_streamp source));\r
+/*\r
+     Sets the destination stream as a complete copy of the source stream.\r
+\r
+     This function can be useful when several compression strategies will be\r
+   tried, for example when there are several ways of pre-processing the input\r
+   data with a filter.  The streams that will be discarded should then be freed\r
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal\r
+   compression state which can be quite large, so this strategy is slow and can\r
+   consume lots of memory.\r
+\r
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not\r
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent\r
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and\r
+   destination.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));\r
+/*\r
+     This function is equivalent to deflateEnd followed by deflateInit,\r
+   but does not free and reallocate all the internal compression state.  The\r
+   stream will keep the same compression level and any other attributes that\r
+   may have been set by deflateInit2.\r
+\r
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source\r
+   stream state was inconsistent (such as zalloc or state being Z_NULL).\r
+*/\r
+\r
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,\r
+                                      int level,\r
+                                      int strategy));\r
+/*\r
+     Dynamically update the compression level and compression strategy.  The\r
+   interpretation of level and strategy is as in deflateInit2.  This can be\r
+   used to switch between compression and straight copy of the input data, or\r
+   to switch to a different kind of input data requiring a different strategy.\r
+   If the compression level is changed, the input available so far is\r
+   compressed with the old level (and may be flushed); the new level will take\r
+   effect only at the next call of deflate().\r
+\r
+     Before the call of deflateParams, the stream state must be set as for\r
+   a call of deflate(), since the currently available input may have to be\r
+   compressed and flushed.  In particular, strm->avail_out must be non-zero.\r
+\r
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source\r
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if\r
+   strm->avail_out was zero.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,\r
+                                    int good_length,\r
+                                    int max_lazy,\r
+                                    int nice_length,\r
+                                    int max_chain));\r
+/*\r
+     Fine tune deflate's internal compression parameters.  This should only be\r
+   used by someone who understands the algorithm used by zlib's deflate for\r
+   searching for the best matching string, and even then only by the most\r
+   fanatic optimizer trying to squeeze out the last compressed bit for their\r
+   specific input data.  Read the deflate.c source code for the meaning of the\r
+   max_lazy, good_length, nice_length, and max_chain parameters.\r
+\r
+     deflateTune() can be called after deflateInit() or deflateInit2(), and\r
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.\r
+ */\r
+\r
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,\r
+                                       uLong sourceLen));\r
+/*\r
+     deflateBound() returns an upper bound on the compressed size after\r
+   deflation of sourceLen bytes.  It must be called after deflateInit() or\r
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used\r
+   to allocate an output buffer for deflation in a single pass, and so would be\r
+   called before deflate().\r
+*/\r
+\r
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,\r
+                                     int bits,\r
+                                     int value));\r
+/*\r
+     deflatePrime() inserts bits in the deflate output stream.  The intent\r
+   is that this function is used to start off the deflate output with the bits\r
+   leftover from a previous deflate stream when appending to it.  As such, this\r
+   function can only be used for raw deflate, and must be used before the first\r
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less\r
+   than or equal to 16, and that many of the least significant bits of value\r
+   will be inserted in the output.\r
+\r
+     deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source\r
+   stream state was inconsistent.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,\r
+                                         gz_headerp head));\r
+/*\r
+     deflateSetHeader() provides gzip header information for when a gzip\r
+   stream is requested by deflateInit2().  deflateSetHeader() may be called\r
+   after deflateInit2() or deflateReset() and before the first call of\r
+   deflate().  The text, time, os, extra field, name, and comment information\r
+   in the provided gz_header structure are written to the gzip header (xflag is\r
+   ignored -- the extra flags are set according to the compression level).  The\r
+   caller must assure that, if not Z_NULL, name and comment are terminated with\r
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are\r
+   available there.  If hcrc is true, a gzip header crc is included.  Note that\r
+   the current versions of the command-line version of gzip (up through version\r
+   1.3.x) do not support header crc's, and will report that it is a "multi-part\r
+   gzip file" and give up.\r
+\r
+     If deflateSetHeader is not used, the default gzip header has text false,\r
+   the time set to zero, and os set to 255, with no extra, name, or comment\r
+   fields.  The gzip header is returned to the default state by deflateReset().\r
+\r
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source\r
+   stream state was inconsistent.\r
+*/\r
+\r
+/*\r
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,\r
+                                     int  windowBits));\r
+\r
+     This is another version of inflateInit with an extra parameter.  The\r
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized\r
+   before by the caller.\r
+\r
+     The windowBits parameter is the base two logarithm of the maximum window\r
+   size (the size of the history buffer).  It should be in the range 8..15 for\r
+   this version of the library.  The default value is 15 if inflateInit is used\r
+   instead.  windowBits must be greater than or equal to the windowBits value\r
+   provided to deflateInit2() while compressing, or it must be equal to 15 if\r
+   deflateInit2() was not used.  If a compressed stream with a larger window\r
+   size is given as input, inflate() will return with the error code\r
+   Z_DATA_ERROR instead of trying to allocate a larger window.\r
+\r
+     windowBits can also be zero to request that inflate use the window size in\r
+   the zlib header of the compressed stream.\r
+\r
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits\r
+   determines the window size.  inflate() will then process raw deflate data,\r
+   not looking for a zlib or gzip header, not generating a check value, and not\r
+   looking for any check values for comparison at the end of the stream.  This\r
+   is for use with other formats that use the deflate compressed data format\r
+   such as zip.  Those formats provide their own check values.  If a custom\r
+   format is developed using the raw deflate format for compressed data, it is\r
+   recommended that a check value such as an adler32 or a crc32 be applied to\r
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For\r
+   most applications, the zlib format should be used as is.  Note that comments\r
+   above on the use in deflateInit2() applies to the magnitude of windowBits.\r
+\r
+     windowBits can also be greater than 15 for optional gzip decoding.  Add\r
+   32 to windowBits to enable zlib and gzip decoding with automatic header\r
+   detection, or add 16 to decode only the gzip format (the zlib format will\r
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a\r
+   crc32 instead of an adler32.\r
+\r
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough\r
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the\r
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are\r
+   invalid, such as a null pointer to the structure.  msg is set to null if\r
+   there is no error message.  inflateInit2 does not perform any decompression\r
+   apart from possibly reading the zlib header if present: actual decompression\r
+   will be done by inflate().  (So next_in and avail_in may be modified, but\r
+   next_out and avail_out are unused and unchanged.) The current implementation\r
+   of inflateInit2() does not process any header information -- that is\r
+   deferred until inflate() is called.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,\r
+                                             const Bytef *dictionary,\r
+                                             uInt  dictLength));\r
+/*\r
+     Initializes the decompression dictionary from the given uncompressed byte\r
+   sequence.  This function must be called immediately after a call of inflate,\r
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor\r
+   can be determined from the adler32 value returned by that call of inflate.\r
+   The compressor and decompressor must use exactly the same dictionary (see\r
+   deflateSetDictionary).  For raw inflate, this function can be called\r
+   immediately after inflateInit2() or inflateReset() and before any call of\r
+   inflate() to set the dictionary.  The application must insure that the\r
+   dictionary that was used for compression is provided.\r
+\r
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a\r
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is\r
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the\r
+   expected one (incorrect adler32 value).  inflateSetDictionary does not\r
+   perform any decompression: this will be done by subsequent calls of\r
+   inflate().\r
+*/\r
+\r
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));\r
+/*\r
+     Skips invalid compressed data until a full flush point (see above the\r
+   description of deflate with Z_FULL_FLUSH) can be found, or until all\r
+   available input is skipped.  No output is provided.\r
+\r
+     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR\r
+   if no more input was provided, Z_DATA_ERROR if no flush point has been\r
+   found, or Z_STREAM_ERROR if the stream structure was inconsistent.  In the\r
+   success case, the application may save the current current value of total_in\r
+   which indicates where valid compressed data was found.  In the error case,\r
+   the application may repeatedly call inflateSync, providing more input each\r
+   time, until success or end of the input data.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,\r
+                                    z_streamp source));\r
+/*\r
+     Sets the destination stream as a complete copy of the source stream.\r
+\r
+     This function can be useful when randomly accessing a large stream.  The\r
+   first pass through the stream can periodically record the inflate state,\r
+   allowing restarting inflate at those points when randomly accessing the\r
+   stream.\r
+\r
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not\r
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent\r
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and\r
+   destination.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));\r
+/*\r
+     This function is equivalent to inflateEnd followed by inflateInit,\r
+   but does not free and reallocate all the internal decompression state.  The\r
+   stream will keep attributes that may have been set by inflateInit2.\r
+\r
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source\r
+   stream state was inconsistent (such as zalloc or state being Z_NULL).\r
+*/\r
+\r
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,\r
+                                      int windowBits));\r
+/*\r
+     This function is the same as inflateReset, but it also permits changing\r
+   the wrap and window size requests.  The windowBits parameter is interpreted\r
+   the same as it is for inflateInit2.\r
+\r
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source\r
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if\r
+   the windowBits parameter is invalid.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,\r
+                                     int bits,\r
+                                     int value));\r
+/*\r
+     This function inserts bits in the inflate input stream.  The intent is\r
+   that this function is used to start inflating at a bit position in the\r
+   middle of a byte.  The provided bits will be used before any bytes are used\r
+   from next_in.  This function should only be used with raw inflate, and\r
+   should be used before the first inflate() call after inflateInit2() or\r
+   inflateReset().  bits must be less than or equal to 16, and that many of the\r
+   least significant bits of value will be inserted in the input.\r
+\r
+     If bits is negative, then the input stream bit buffer is emptied.  Then\r
+   inflatePrime() can be called again to put bits in the buffer.  This is used\r
+   to clear out bits leftover after feeding inflate a block description prior\r
+   to feeding inflate codes.\r
+\r
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source\r
+   stream state was inconsistent.\r
+*/\r
+\r
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));\r
+/*\r
+     This function returns two values, one in the lower 16 bits of the return\r
+   value, and the other in the remaining upper bits, obtained by shifting the\r
+   return value down 16 bits.  If the upper value is -1 and the lower value is\r
+   zero, then inflate() is currently decoding information outside of a block.\r
+   If the upper value is -1 and the lower value is non-zero, then inflate is in\r
+   the middle of a stored block, with the lower value equaling the number of\r
+   bytes from the input remaining to copy.  If the upper value is not -1, then\r
+   it is the number of bits back from the current bit position in the input of\r
+   the code (literal or length/distance pair) currently being processed.  In\r
+   that case the lower value is the number of bytes already emitted for that\r
+   code.\r
+\r
+     A code is being processed if inflate is waiting for more input to complete\r
+   decoding of the code, or if it has completed decoding but is waiting for\r
+   more output space to write the literal or match data.\r
+\r
+     inflateMark() is used to mark locations in the input data for random\r
+   access, which may be at bit positions, and to note those cases where the\r
+   output of a code may span boundaries of random access blocks.  The current\r
+   location in the input stream can be determined from avail_in and data_type\r
+   as noted in the description for the Z_BLOCK flush parameter for inflate.\r
+\r
+     inflateMark returns the value noted above or -1 << 16 if the provided\r
+   source stream state was inconsistent.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,\r
+                                         gz_headerp head));\r
+/*\r
+     inflateGetHeader() requests that gzip header information be stored in the\r
+   provided gz_header structure.  inflateGetHeader() may be called after\r
+   inflateInit2() or inflateReset(), and before the first call of inflate().\r
+   As inflate() processes the gzip stream, head->done is zero until the header\r
+   is completed, at which time head->done is set to one.  If a zlib stream is\r
+   being decoded, then head->done is set to -1 to indicate that there will be\r
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be\r
+   used to force inflate() to return immediately after header processing is\r
+   complete and before any actual data is decompressed.\r
+\r
+     The text, time, xflags, and os fields are filled in with the gzip header\r
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC\r
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max\r
+   contains the maximum number of bytes to write to extra.  Once done is true,\r
+   extra_len contains the actual extra field length, and extra contains the\r
+   extra field, or that field truncated if extra_max is less than extra_len.\r
+   If name is not Z_NULL, then up to name_max characters are written there,\r
+   terminated with a zero unless the length is greater than name_max.  If\r
+   comment is not Z_NULL, then up to comm_max characters are written there,\r
+   terminated with a zero unless the length is greater than comm_max.  When any\r
+   of extra, name, or comment are not Z_NULL and the respective field is not\r
+   present in the header, then that field is set to Z_NULL to signal its\r
+   absence.  This allows the use of deflateSetHeader() with the returned\r
+   structure to duplicate the header.  However if those fields are set to\r
+   allocated memory, then the application will need to save those pointers\r
+   elsewhere so that they can be eventually freed.\r
+\r
+     If inflateGetHeader is not used, then the header information is simply\r
+   discarded.  The header is always checked for validity, including the header\r
+   CRC if present.  inflateReset() will reset the process to discard the header\r
+   information.  The application would need to call inflateGetHeader() again to\r
+   retrieve the header from the next gzip stream.\r
+\r
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source\r
+   stream state was inconsistent.\r
+*/\r
+\r
+/*\r
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,\r
+                                        unsigned char FAR *window));\r
+\r
+     Initialize the internal stream state for decompression using inflateBack()\r
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized\r
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-\r
+   derived memory allocation routines are used.  windowBits is the base two\r
+   logarithm of the window size, in the range 8..15.  window is a caller\r
+   supplied buffer of that size.  Except for special applications where it is\r
+   assured that deflate was used with small window sizes, windowBits must be 15\r
+   and a 32K byte window must be supplied to be able to decompress general\r
+   deflate streams.\r
+\r
+     See inflateBack() for the usage of these routines.\r
+\r
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of\r
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not be\r
+   allocated, or Z_VERSION_ERROR if the version of the library does not match\r
+   the version of the header file.\r
+*/\r
+\r
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));\r
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));\r
+\r
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,\r
+                                    in_func in, void FAR *in_desc,\r
+                                    out_func out, void FAR *out_desc));\r
+/*\r
+     inflateBack() does a raw inflate with a single call using a call-back\r
+   interface for input and output.  This is more efficient than inflate() for\r
+   file i/o applications in that it avoids copying between the output and the\r
+   sliding window by simply making the window itself the output buffer.  This\r
+   function trusts the application to not change the output buffer passed by\r
+   the output function, at least until inflateBack() returns.\r
+\r
+     inflateBackInit() must be called first to allocate the internal state\r
+   and to initialize the state with the user-provided window buffer.\r
+   inflateBack() may then be used multiple times to inflate a complete, raw\r
+   deflate stream with each call.  inflateBackEnd() is then called to free the\r
+   allocated state.\r
+\r
+     A raw deflate stream is one with no zlib or gzip header or trailer.\r
+   This routine would normally be used in a utility that reads zip or gzip\r
+   files and writes out uncompressed files.  The utility would decode the\r
+   header and process the trailer on its own, hence this routine expects only\r
+   the raw deflate stream to decompress.  This is different from the normal\r
+   behavior of inflate(), which expects either a zlib or gzip header and\r
+   trailer around the deflate stream.\r
+\r
+     inflateBack() uses two subroutines supplied by the caller that are then\r
+   called by inflateBack() for input and output.  inflateBack() calls those\r
+   routines until it reads a complete deflate stream and writes out all of the\r
+   uncompressed data, or until it encounters an error.  The function's\r
+   parameters and return types are defined above in the in_func and out_func\r
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the\r
+   number of bytes of provided input, and a pointer to that input in buf.  If\r
+   there is no input available, in() must return zero--buf is ignored in that\r
+   case--and inflateBack() will return a buffer error.  inflateBack() will call\r
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()\r
+   should return zero on success, or non-zero on failure.  If out() returns\r
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()\r
+   are permitted to change the contents of the window provided to\r
+   inflateBackInit(), which is also the buffer that out() uses to write from.\r
+   The length written by out() will be at most the window size.  Any non-zero\r
+   amount of input may be provided by in().\r
+\r
+     For convenience, inflateBack() can be provided input on the first call by\r
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then\r
+   in() will be called.  Therefore strm->next_in must be initialized before\r
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called\r
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in\r
+   must also be initialized, and then if strm->avail_in is not zero, input will\r
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].\r
+\r
+     The in_desc and out_desc parameters of inflateBack() is passed as the\r
+   first parameter of in() and out() respectively when they are called.  These\r
+   descriptors can be optionally used to pass any information that the caller-\r
+   supplied in() and out() functions need to do their job.\r
+\r
+     On return, inflateBack() will set strm->next_in and strm->avail_in to\r
+   pass back any unused input that was provided by the last in() call.  The\r
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR\r
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error\r
+   in the deflate stream (in which case strm->msg is set to indicate the nature\r
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.\r
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished\r
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If\r
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning\r
+   non-zero.  (in() will always be called before out(), so strm->next_in is\r
+   assured to be defined if out() returns non-zero.) Note that inflateBack()\r
+   cannot return Z_OK.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));\r
+/*\r
+     All memory allocated by inflateBackInit() is freed.\r
+\r
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream\r
+   state was inconsistent.\r
+*/\r
+\r
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));\r
+/* Return flags indicating compile-time options.\r
+\r
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:\r
+     1.0: size of uInt\r
+     3.2: size of uLong\r
+     5.4: size of voidpf (pointer)\r
+     7.6: size of z_off_t\r
+\r
+    Compiler, assembler, and debug options:\r
+     8: DEBUG\r
+     9: ASMV or ASMINF -- use ASM code\r
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention\r
+     11: 0 (reserved)\r
+\r
+    One-time table building (smaller code, but not thread-safe if true):\r
+     12: BUILDFIXED -- build static block decoding tables when needed\r
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed\r
+     14,15: 0 (reserved)\r
+\r
+    Library content (indicates missing functionality):\r
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking\r
+                          deflate code when not needed)\r
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect\r
+                    and decode gzip streams (to avoid linking crc code)\r
+     18-19: 0 (reserved)\r
+\r
+    Operation variations (changes in library functionality):\r
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate\r
+     21: FASTEST -- deflate algorithm with only one, lowest compression level\r
+     22,23: 0 (reserved)\r
+\r
+    The sprintf variant used by gzprintf (zero is best):\r
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format\r
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!\r
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned\r
+\r
+    Remainder:\r
+     27-31: 0 (reserved)\r
+ */\r
+\r
+\r
+                        /* utility functions */\r
+\r
+/*\r
+     The following utility functions are implemented on top of the basic\r
+   stream-oriented functions.  To simplify the interface, some default options\r
+   are assumed (compression level and memory usage, standard memory allocation\r
+   functions).  The source code of these utility functions can be modified if\r
+   you need special options.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,\r
+                                 const Bytef *source, uLong sourceLen));\r
+/*\r
+     Compresses the source buffer into the destination buffer.  sourceLen is\r
+   the byte length of the source buffer.  Upon entry, destLen is the total size\r
+   of the destination buffer, which must be at least the value returned by\r
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the\r
+   compressed buffer.\r
+\r
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not\r
+   enough memory, Z_BUF_ERROR if there was not enough room in the output\r
+   buffer.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,\r
+                                  const Bytef *source, uLong sourceLen,\r
+                                  int level));\r
+/*\r
+     Compresses the source buffer into the destination buffer.  The level\r
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte\r
+   length of the source buffer.  Upon entry, destLen is the total size of the\r
+   destination buffer, which must be at least the value returned by\r
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the\r
+   compressed buffer.\r
+\r
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough\r
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,\r
+   Z_STREAM_ERROR if the level parameter is invalid.\r
+*/\r
+\r
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));\r
+/*\r
+     compressBound() returns an upper bound on the compressed size after\r
+   compress() or compress2() on sourceLen bytes.  It would be used before a\r
+   compress() or compress2() call to allocate the destination buffer.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,\r
+                                   const Bytef *source, uLong sourceLen));\r
+/*\r
+     Decompresses the source buffer into the destination buffer.  sourceLen is\r
+   the byte length of the source buffer.  Upon entry, destLen is the total size\r
+   of the destination buffer, which must be large enough to hold the entire\r
+   uncompressed data.  (The size of the uncompressed data must have been saved\r
+   previously by the compressor and transmitted to the decompressor by some\r
+   mechanism outside the scope of this compression library.) Upon exit, destLen\r
+   is the actual size of the uncompressed buffer.\r
+\r
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not\r
+   enough memory, Z_BUF_ERROR if there was not enough room in the output\r
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.\r
+*/\r
+\r
+\r
+                        /* gzip file access functions */\r
+\r
+/*\r
+     This library supports reading and writing files in gzip (.gz) format with\r
+   an interface similar to that of stdio, using the functions that start with\r
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip\r
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.\r
+*/\r
+\r
+typedef voidp gzFile;       /* opaque gzip file descriptor */\r
+\r
+/*\r
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));\r
+\r
+     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as\r
+   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or\r
+   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only\r
+   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'\r
+   for fixed code compression as in "wb9F".  (See the description of\r
+   deflateInit2 for more information about the strategy parameter.) Also "a"\r
+   can be used instead of "w" to request that the gzip stream that will be\r
+   written be appended to the file.  "+" will result in an error, since reading\r
+   and writing to the same gzip file is not supported.\r
+\r
+     gzopen can be used to read a file which is not in gzip format; in this\r
+   case gzread will directly read from the file without decompression.\r
+\r
+     gzopen returns NULL if the file could not be opened, if there was\r
+   insufficient memory to allocate the gzFile state, or if an invalid mode was\r
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).\r
+   errno can be checked to determine if the reason gzopen failed was that the\r
+   file could not be opened.\r
+*/\r
+\r
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));\r
+/*\r
+     gzdopen associates a gzFile with the file descriptor fd.  File descriptors\r
+   are obtained from calls like open, dup, creat, pipe or fileno (if the file\r
+   has been previously opened with fopen).  The mode parameter is as in gzopen.\r
+\r
+     The next call of gzclose on the returned gzFile will also close the file\r
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor\r
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,\r
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since\r
+   gzdopen does not close fd if it fails.\r
+\r
+     gzdopen returns NULL if there was insufficient memory to allocate the\r
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not\r
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not\r
+   used until the next gz* read, write, seek, or close operation, so gzdopen\r
+   will not detect if fd is invalid (unless fd is -1).\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));\r
+/*\r
+     Set the internal buffer size used by this library's functions.  The\r
+   default buffer size is 8192 bytes.  This function must be called after\r
+   gzopen() or gzdopen(), and before any other calls that read or write the\r
+   file.  The buffer memory allocation is always deferred to the first read or\r
+   write.  Two buffers are allocated, either both of the specified size when\r
+   writing, or one of the specified size and the other twice that size when\r
+   reading.  A larger buffer size of, for example, 64K or 128K bytes will\r
+   noticeably increase the speed of decompression (reading).\r
+\r
+     The new buffer size also affects the maximum length for gzprintf().\r
+\r
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called\r
+   too late.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));\r
+/*\r
+     Dynamically update the compression level or strategy.  See the description\r
+   of deflateInit2 for the meaning of these parameters.\r
+\r
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not\r
+   opened for writing.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));\r
+/*\r
+     Reads the given number of uncompressed bytes from the compressed file.  If\r
+   the input file was not in gzip format, gzread copies the given number of\r
+   bytes into the buffer.\r
+\r
+     After reaching the end of a gzip stream in the input, gzread will continue\r
+   to read, looking for another gzip stream, or failing that, reading the rest\r
+   of the input file directly without decompression.  The entire input file\r
+   will be read if gzread is called until it returns less than the requested\r
+   len.\r
+\r
+     gzread returns the number of uncompressed bytes actually read, less than\r
+   len for end of file, or -1 for error.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,\r
+                                voidpc buf, unsigned len));\r
+/*\r
+     Writes the given number of uncompressed bytes into the compressed file.\r
+   gzwrite returns the number of uncompressed bytes written or 0 in case of\r
+   error.\r
+*/\r
+\r
+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));\r
+/*\r
+     Converts, formats, and writes the arguments to the compressed file under\r
+   control of the format string, as in fprintf.  gzprintf returns the number of\r
+   uncompressed bytes actually written, or 0 in case of error.  The number of\r
+   uncompressed bytes written is limited to 8191, or one less than the buffer\r
+   size given to gzbuffer().  The caller should assure that this limit is not\r
+   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with\r
+   nothing written.  In this case, there may also be a buffer overflow with\r
+   unpredictable consequences, which is possible only if zlib was compiled with\r
+   the insecure functions sprintf() or vsprintf() because the secure snprintf()\r
+   or vsnprintf() functions were not available.  This can be determined using\r
+   zlibCompileFlags().\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));\r
+/*\r
+     Writes the given null-terminated string to the compressed file, excluding\r
+   the terminating null character.\r
+\r
+     gzputs returns the number of characters written, or -1 in case of error.\r
+*/\r
+\r
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));\r
+/*\r
+     Reads bytes from the compressed file until len-1 characters are read, or a\r
+   newline character is read and transferred to buf, or an end-of-file\r
+   condition is encountered.  If any characters are read or if len == 1, the\r
+   string is terminated with a null character.  If no characters are read due\r
+   to an end-of-file or len < 1, then the buffer is left untouched.\r
+\r
+     gzgets returns buf which is a null-terminated string, or it returns NULL\r
+   for end-of-file or in case of error.  If there was an error, the contents at\r
+   buf are indeterminate.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));\r
+/*\r
+     Writes c, converted to an unsigned char, into the compressed file.  gzputc\r
+   returns the value that was written, or -1 in case of error.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));\r
+/*\r
+     Reads one byte from the compressed file.  gzgetc returns this byte or -1\r
+   in case of end of file or error.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));\r
+/*\r
+     Push one character back onto the stream to be read as the first character\r
+   on the next read.  At least one character of push-back is allowed.\r
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will\r
+   fail if c is -1, and may fail if a character has been pushed but not read\r
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the\r
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)\r
+   The pushed character will be discarded if the stream is repositioned with\r
+   gzseek() or gzrewind().\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));\r
+/*\r
+     Flushes all pending output into the compressed file.  The parameter flush\r
+   is as in the deflate() function.  The return value is the zlib error number\r
+   (see function gzerror below).  gzflush is only permitted when writing.\r
+\r
+     If the flush parameter is Z_FINISH, the remaining data is written and the\r
+   gzip stream is completed in the output.  If gzwrite() is called again, a new\r
+   gzip stream will be started in the output.  gzread() is able to read such\r
+   concatented gzip streams.\r
+\r
+     gzflush should be called only when strictly necessary because it will\r
+   degrade compression if called too often.\r
+*/\r
+\r
+/*\r
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,\r
+                                   z_off_t offset, int whence));\r
+\r
+     Sets the starting position for the next gzread or gzwrite on the given\r
+   compressed file.  The offset represents a number of bytes in the\r
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);\r
+   the value SEEK_END is not supported.\r
+\r
+     If the file is opened for reading, this function is emulated but can be\r
+   extremely slow.  If the file is opened for writing, only forward seeks are\r
+   supported; gzseek then compresses a sequence of zeroes up to the new\r
+   starting position.\r
+\r
+     gzseek returns the resulting offset location as measured in bytes from\r
+   the beginning of the uncompressed stream, or -1 in case of error, in\r
+   particular if the file is opened for writing and the new starting position\r
+   would be before the current position.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));\r
+/*\r
+     Rewinds the given file. This function is supported only for reading.\r
+\r
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)\r
+*/\r
+\r
+/*\r
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));\r
+\r
+     Returns the starting position for the next gzread or gzwrite on the given\r
+   compressed file.  This position represents a number of bytes in the\r
+   uncompressed data stream, and is zero when starting, even if appending or\r
+   reading a gzip stream from the middle of a file using gzdopen().\r
+\r
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)\r
+*/\r
+\r
+/*\r
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));\r
+\r
+     Returns the current offset in the file being read or written.  This offset\r
+   includes the count of bytes that precede the gzip stream, for example when\r
+   appending or when using gzdopen() for reading.  When reading, the offset\r
+   does not include as yet unused buffered input.  This information can be used\r
+   for a progress indicator.  On error, gzoffset() returns -1.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));\r
+/*\r
+     Returns true (1) if the end-of-file indicator has been set while reading,\r
+   false (0) otherwise.  Note that the end-of-file indicator is set only if the\r
+   read tried to go past the end of the input, but came up short.  Therefore,\r
+   just like feof(), gzeof() may return false even if there is no more data to\r
+   read, in the event that the last read request was for the exact number of\r
+   bytes remaining in the input file.  This will happen if the input file size\r
+   is an exact multiple of the buffer size.\r
+\r
+     If gzeof() returns true, then the read functions will return no more data,\r
+   unless the end-of-file indicator is reset by gzclearerr() and the input file\r
+   has grown since the previous end of file was detected.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));\r
+/*\r
+     Returns true (1) if file is being copied directly while reading, or false\r
+   (0) if file is a gzip stream being decompressed.  This state can change from\r
+   false to true while reading the input file if the end of a gzip stream is\r
+   reached, but is followed by data that is not another gzip stream.\r
+\r
+     If the input file is empty, gzdirect() will return true, since the input\r
+   does not contain a gzip stream.\r
+\r
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will\r
+   cause buffers to be allocated to allow reading the file to determine if it\r
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before\r
+   gzdirect().\r
+*/\r
+\r
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));\r
+/*\r
+     Flushes all pending output if necessary, closes the compressed file and\r
+   deallocates the (de)compression state.  Note that once file is closed, you\r
+   cannot call gzerror with file, since its structures have been deallocated.\r
+   gzclose must not be called more than once on the same file, just as free\r
+   must not be called more than once on the same allocation.\r
+\r
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a\r
+   file operation error, or Z_OK on success.\r
+*/\r
+\r
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));\r
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));\r
+/*\r
+     Same as gzclose(), but gzclose_r() is only for use when reading, and\r
+   gzclose_w() is only for use when writing or appending.  The advantage to\r
+   using these instead of gzclose() is that they avoid linking in zlib\r
+   compression or decompression code that is not used when only reading or only\r
+   writing respectively.  If gzclose() is used, then both compression and\r
+   decompression code will be included the application when linking to a static\r
+   zlib library.\r
+*/\r
+\r
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));\r
+/*\r
+     Returns the error message for the last error which occurred on the given\r
+   compressed file.  errnum is set to zlib error number.  If an error occurred\r
+   in the file system and not in the compression library, errnum is set to\r
+   Z_ERRNO and the application may consult errno to get the exact error code.\r
+\r
+     The application must not modify the returned string.  Future calls to\r
+   this function may invalidate the previously returned string.  If file is\r
+   closed, then the string previously returned by gzerror will no longer be\r
+   available.\r
+\r
+     gzerror() should be used to distinguish errors from end-of-file for those\r
+   functions above that do not distinguish those cases in their return values.\r
+*/\r
+\r
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));\r
+/*\r
+     Clears the error and end-of-file flags for file.  This is analogous to the\r
+   clearerr() function in stdio.  This is useful for continuing to read a gzip\r
+   file that is being written concurrently.\r
+*/\r
+\r
+\r
+                        /* checksum functions */\r
+\r
+/*\r
+     These functions are not related to compression but are exported\r
+   anyway because they might be useful in applications using the compression\r
+   library.\r
+*/\r
+\r
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));\r
+/*\r
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and\r
+   return the updated checksum.  If buf is Z_NULL, this function returns the\r
+   required initial value for the checksum.\r
+\r
+     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed\r
+   much faster.\r
+\r
+   Usage example:\r
+\r
+     uLong adler = adler32(0L, Z_NULL, 0);\r
+\r
+     while (read_buffer(buffer, length) != EOF) {\r
+       adler = adler32(adler, buffer, length);\r
+     }\r
+     if (adler != original_adler) error();\r
+*/\r
+\r
+/*\r
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,\r
+                                          z_off_t len2));\r
+\r
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1\r
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for\r
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of\r
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.\r
+*/\r
+\r
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));\r
+/*\r
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the\r
+   updated CRC-32.  If buf is Z_NULL, this function returns the required\r
+   initial value for the for the crc.  Pre- and post-conditioning (one's\r
+   complement) is performed within this function so it shouldn't be done by the\r
+   application.\r
+\r
+   Usage example:\r
+\r
+     uLong crc = crc32(0L, Z_NULL, 0);\r
+\r
+     while (read_buffer(buffer, length) != EOF) {\r
+       crc = crc32(crc, buffer, length);\r
+     }\r
+     if (crc != original_crc) error();\r
+*/\r
+\r
+/*\r
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));\r
+\r
+     Combine two CRC-32 check values into one.  For two sequences of bytes,\r
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were\r
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32\r
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and\r
+   len2.\r
+*/\r
+\r
+\r
+                        /* various hacks, don't look :) */\r
+\r
+/* deflateInit and inflateInit are macros to allow checking the zlib version\r
+ * and the compiler's view of z_stream:\r
+ */\r
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,\r
+                                     const char *version, int stream_size));\r
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,\r
+                                     const char *version, int stream_size));\r
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,\r
+                                      int windowBits, int memLevel,\r
+                                      int strategy, const char *version,\r
+                                      int stream_size));\r
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,\r
+                                      const char *version, int stream_size));\r
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,\r
+                                         unsigned char FAR *window,\r
+                                         const char *version,\r
+                                         int stream_size));\r
+#define deflateInit(strm, level) \\r
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))\r
+#define inflateInit(strm) \\r
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))\r
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \\r
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\\r
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))\r
+#define inflateInit2(strm, windowBits) \\r
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))\r
+#define inflateBackInit(strm, windowBits, window) \\r
+        inflateBackInit_((strm), (windowBits), (window), \\r
+                                            ZLIB_VERSION, sizeof(z_stream))\r
+\r
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or\r
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if\r
+ * both are true, the application gets the *64 functions, and the regular\r
+ * functions are changed to 64 bits) -- in case these are set on systems\r
+ * without large file support, _LFS64_LARGEFILE must also be true\r
+ */\r
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0\r
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));\r
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));\r
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));\r
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));\r
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));\r
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));\r
+#endif\r
+\r
+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0\r
+#  define gzopen gzopen64\r
+#  define gzseek gzseek64\r
+#  define gztell gztell64\r
+#  define gzoffset gzoffset64\r
+#  define adler32_combine adler32_combine64\r
+#  define crc32_combine crc32_combine64\r
+#  ifdef _LARGEFILE64_SOURCE\r
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));\r
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));\r
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));\r
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));\r
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));\r
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));\r
+#  endif\r
+#else\r
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));\r
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));\r
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));\r
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));\r
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));\r
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));\r
+#endif\r
+\r
+/* hack for buggy compilers */\r
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)\r
+    struct internal_state {int dummy;};\r
+#endif\r
+\r
+/* undocumented functions */\r
+ZEXTERN const char   * ZEXPORT zError           OF((int));\r
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));\r
+ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));\r
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));\r
+\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+\r
+#endif /* ZLIB_H */\r
diff --git a/win32port/zlib/zutil.c b/win32port/zlib/zutil.c
new file mode 100644 (file)
index 0000000..e33ae8b
--- /dev/null
@@ -0,0 +1,318 @@
+/* zutil.c -- target dependent utility functions for the compression library\r
+ * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#include "zutil.h"\r
+\r
+#ifndef NO_DUMMY_DECL\r
+struct internal_state      {int dummy;}; /* for buggy compilers */\r
+#endif\r
+\r
+const char * const z_errmsg[10] = {\r
+"need dictionary",     /* Z_NEED_DICT       2  */\r
+"stream end",          /* Z_STREAM_END      1  */\r
+"",                    /* Z_OK              0  */\r
+"file error",          /* Z_ERRNO         (-1) */\r
+"stream error",        /* Z_STREAM_ERROR  (-2) */\r
+"data error",          /* Z_DATA_ERROR    (-3) */\r
+"insufficient memory", /* Z_MEM_ERROR     (-4) */\r
+"buffer error",        /* Z_BUF_ERROR     (-5) */\r
+"incompatible version",/* Z_VERSION_ERROR (-6) */\r
+""};\r
+\r
+\r
+const char * ZEXPORT zlibVersion()\r
+{\r
+    return ZLIB_VERSION;\r
+}\r
+\r
+uLong ZEXPORT zlibCompileFlags()\r
+{\r
+    uLong flags;\r
+\r
+    flags = 0;\r
+    switch ((int)(sizeof(uInt))) {\r
+    case 2:     break;\r
+    case 4:     flags += 1;     break;\r
+    case 8:     flags += 2;     break;\r
+    default:    flags += 3;\r
+    }\r
+    switch ((int)(sizeof(uLong))) {\r
+    case 2:     break;\r
+    case 4:     flags += 1 << 2;        break;\r
+    case 8:     flags += 2 << 2;        break;\r
+    default:    flags += 3 << 2;\r
+    }\r
+    switch ((int)(sizeof(voidpf))) {\r
+    case 2:     break;\r
+    case 4:     flags += 1 << 4;        break;\r
+    case 8:     flags += 2 << 4;        break;\r
+    default:    flags += 3 << 4;\r
+    }\r
+    switch ((int)(sizeof(z_off_t))) {\r
+    case 2:     break;\r
+    case 4:     flags += 1 << 6;        break;\r
+    case 8:     flags += 2 << 6;        break;\r
+    default:    flags += 3 << 6;\r
+    }\r
+#ifdef DEBUG\r
+    flags += 1 << 8;\r
+#endif\r
+#if defined(ASMV) || defined(ASMINF)\r
+    flags += 1 << 9;\r
+#endif\r
+#ifdef ZLIB_WINAPI\r
+    flags += 1 << 10;\r
+#endif\r
+#ifdef BUILDFIXED\r
+    flags += 1 << 12;\r
+#endif\r
+#ifdef DYNAMIC_CRC_TABLE\r
+    flags += 1 << 13;\r
+#endif\r
+#ifdef NO_GZCOMPRESS\r
+    flags += 1L << 16;\r
+#endif\r
+#ifdef NO_GZIP\r
+    flags += 1L << 17;\r
+#endif\r
+#ifdef PKZIP_BUG_WORKAROUND\r
+    flags += 1L << 20;\r
+#endif\r
+#ifdef FASTEST\r
+    flags += 1L << 21;\r
+#endif\r
+#ifdef STDC\r
+#  ifdef NO_vsnprintf\r
+        flags += 1L << 25;\r
+#    ifdef HAS_vsprintf_void\r
+        flags += 1L << 26;\r
+#    endif\r
+#  else\r
+#    ifdef HAS_vsnprintf_void\r
+        flags += 1L << 26;\r
+#    endif\r
+#  endif\r
+#else\r
+        flags += 1L << 24;\r
+#  ifdef NO_snprintf\r
+        flags += 1L << 25;\r
+#    ifdef HAS_sprintf_void\r
+        flags += 1L << 26;\r
+#    endif\r
+#  else\r
+#    ifdef HAS_snprintf_void\r
+        flags += 1L << 26;\r
+#    endif\r
+#  endif\r
+#endif\r
+    return flags;\r
+}\r
+\r
+#ifdef DEBUG\r
+\r
+#  ifndef verbose\r
+#    define verbose 0\r
+#  endif\r
+int ZLIB_INTERNAL z_verbose = verbose;\r
+\r
+void ZLIB_INTERNAL z_error (m)\r
+    char *m;\r
+{\r
+    fprintf(stderr, "%s\n", m);\r
+    exit(1);\r
+}\r
+#endif\r
+\r
+/* exported to allow conversion of error code to string for compress() and\r
+ * uncompress()\r
+ */\r
+const char * ZEXPORT zError(err)\r
+    int err;\r
+{\r
+    return ERR_MSG(err);\r
+}\r
+\r
+#if defined(_WIN32_WCE)\r
+    /* The Microsoft C Run-Time Library for Windows CE doesn't have\r
+     * errno.  We define it as a global variable to simplify porting.\r
+     * Its value is always 0 and should not be used.\r
+     */\r
+    int errno = 0;\r
+#endif\r
+\r
+#ifndef HAVE_MEMCPY\r
+\r
+void ZLIB_INTERNAL zmemcpy(dest, source, len)\r
+    Bytef* dest;\r
+    const Bytef* source;\r
+    uInt  len;\r
+{\r
+    if (len == 0) return;\r
+    do {\r
+        *dest++ = *source++; /* ??? to be unrolled */\r
+    } while (--len != 0);\r
+}\r
+\r
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)\r
+    const Bytef* s1;\r
+    const Bytef* s2;\r
+    uInt  len;\r
+{\r
+    uInt j;\r
+\r
+    for (j = 0; j < len; j++) {\r
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;\r
+    }\r
+    return 0;\r
+}\r
+\r
+void ZLIB_INTERNAL zmemzero(dest, len)\r
+    Bytef* dest;\r
+    uInt  len;\r
+{\r
+    if (len == 0) return;\r
+    do {\r
+        *dest++ = 0;  /* ??? to be unrolled */\r
+    } while (--len != 0);\r
+}\r
+#endif\r
+\r
+\r
+#ifdef SYS16BIT\r
+\r
+#ifdef __TURBOC__\r
+/* Turbo C in 16-bit mode */\r
+\r
+#  define MY_ZCALLOC\r
+\r
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes\r
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we\r
+ * must fix the pointer. Warning: the pointer must be put back to its\r
+ * original form in order to free it, use zcfree().\r
+ */\r
+\r
+#define MAX_PTR 10\r
+/* 10*64K = 640K */\r
+\r
+local int next_ptr = 0;\r
+\r
+typedef struct ptr_table_s {\r
+    voidpf org_ptr;\r
+    voidpf new_ptr;\r
+} ptr_table;\r
+\r
+local ptr_table table[MAX_PTR];\r
+/* This table is used to remember the original form of pointers\r
+ * to large buffers (64K). Such pointers are normalized with a zero offset.\r
+ * Since MSDOS is not a preemptive multitasking OS, this table is not\r
+ * protected from concurrent access. This hack doesn't work anyway on\r
+ * a protected system like OS/2. Use Microsoft C instead.\r
+ */\r
+\r
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)\r
+{\r
+    voidpf buf = opaque; /* just to make some compilers happy */\r
+    ulg bsize = (ulg)items*size;\r
+\r
+    /* If we allocate less than 65520 bytes, we assume that farmalloc\r
+     * will return a usable pointer which doesn't have to be normalized.\r
+     */\r
+    if (bsize < 65520L) {\r
+        buf = farmalloc(bsize);\r
+        if (*(ush*)&buf != 0) return buf;\r
+    } else {\r
+        buf = farmalloc(bsize + 16L);\r
+    }\r
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;\r
+    table[next_ptr].org_ptr = buf;\r
+\r
+    /* Normalize the pointer to seg:0 */\r
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;\r
+    *(ush*)&buf = 0;\r
+    table[next_ptr++].new_ptr = buf;\r
+    return buf;\r
+}\r
+\r
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)\r
+{\r
+    int n;\r
+    if (*(ush*)&ptr != 0) { /* object < 64K */\r
+        farfree(ptr);\r
+        return;\r
+    }\r
+    /* Find the original pointer */\r
+    for (n = 0; n < next_ptr; n++) {\r
+        if (ptr != table[n].new_ptr) continue;\r
+\r
+        farfree(table[n].org_ptr);\r
+        while (++n < next_ptr) {\r
+            table[n-1] = table[n];\r
+        }\r
+        next_ptr--;\r
+        return;\r
+    }\r
+    ptr = opaque; /* just to make some compilers happy */\r
+    Assert(0, "zcfree: ptr not found");\r
+}\r
+\r
+#endif /* __TURBOC__ */\r
+\r
+\r
+#ifdef M_I86\r
+/* Microsoft C in 16-bit mode */\r
+\r
+#  define MY_ZCALLOC\r
+\r
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))\r
+#  define _halloc  halloc\r
+#  define _hfree   hfree\r
+#endif\r
+\r
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)\r
+{\r
+    if (opaque) opaque = 0; /* to make compiler happy */\r
+    return _halloc((long)items, size);\r
+}\r
+\r
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)\r
+{\r
+    if (opaque) opaque = 0; /* to make compiler happy */\r
+    _hfree(ptr);\r
+}\r
+\r
+#endif /* M_I86 */\r
+\r
+#endif /* SYS16BIT */\r
+\r
+\r
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */\r
+\r
+#ifndef STDC\r
+extern voidp  malloc OF((uInt size));\r
+extern voidp  calloc OF((uInt items, uInt size));\r
+extern void   free   OF((voidpf ptr));\r
+#endif\r
+\r
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)\r
+    voidpf opaque;\r
+    unsigned items;\r
+    unsigned size;\r
+{\r
+    if (opaque) items += size - size; /* make compiler happy */\r
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :\r
+                              (voidpf)calloc(items, size);\r
+}\r
+\r
+void ZLIB_INTERNAL zcfree (opaque, ptr)\r
+    voidpf opaque;\r
+    voidpf ptr;\r
+{\r
+    free(ptr);\r
+    if (opaque) return; /* make compiler happy */\r
+}\r
+\r
+#endif /* MY_ZCALLOC */\r
diff --git a/win32port/zlib/zutil.h b/win32port/zlib/zutil.h
new file mode 100644 (file)
index 0000000..a36a406
--- /dev/null
@@ -0,0 +1,274 @@
+/* zutil.h -- internal interface and configuration of the compression library\r
+ * Copyright (C) 1995-2010 Jean-loup Gailly.\r
+ * For conditions of distribution and use, see copyright notice in zlib.h\r
+ */\r
+\r
+/* WARNING: this file should *not* be used by applications. It is\r
+   part of the implementation of the compression library and is\r
+   subject to change. Applications should only use zlib.h.\r
+ */\r
+\r
+/* @(#) $Id$ */\r
+\r
+#ifndef ZUTIL_H\r
+#define ZUTIL_H\r
+\r
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)\r
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))\r
+#else\r
+#  define ZLIB_INTERNAL\r
+#endif\r
+\r
+#include "zlib.h"\r
+\r
+#ifdef STDC\r
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))\r
+#    include <stddef.h>\r
+#  endif\r
+#  include <string.h>\r
+#  include <stdlib.h>\r
+#endif\r
+\r
+#ifndef local\r
+#  define local static\r
+#endif\r
+/* compile with -Dlocal if your debugger can't find static symbols */\r
+\r
+typedef unsigned char  uch;\r
+typedef uch FAR uchf;\r
+typedef unsigned short ush;\r
+typedef ush FAR ushf;\r
+typedef unsigned long  ulg;\r
+\r
+extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */\r
+/* (size given to avoid silly warnings with Visual C++) */\r
+\r
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]\r
+\r
+#define ERR_RETURN(strm,err) \\r
+  return (strm->msg = (char*)ERR_MSG(err), (err))\r
+/* To be used only when the state is known to be valid */\r
+\r
+        /* common constants */\r
+\r
+#ifndef DEF_WBITS\r
+#  define DEF_WBITS MAX_WBITS\r
+#endif\r
+/* default windowBits for decompression. MAX_WBITS is for compression only */\r
+\r
+#if MAX_MEM_LEVEL >= 8\r
+#  define DEF_MEM_LEVEL 8\r
+#else\r
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL\r
+#endif\r
+/* default memLevel */\r
+\r
+#define STORED_BLOCK 0\r
+#define STATIC_TREES 1\r
+#define DYN_TREES    2\r
+/* The three kinds of block type */\r
+\r
+#define MIN_MATCH  3\r
+#define MAX_MATCH  258\r
+/* The minimum and maximum match lengths */\r
+\r
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */\r
+\r
+        /* target dependencies */\r
+\r
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))\r
+#  define OS_CODE  0x00\r
+#  if defined(__TURBOC__) || defined(__BORLANDC__)\r
+#    if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))\r
+       /* Allow compilation with ANSI keywords only enabled */\r
+       void _Cdecl farfree( void *block );\r
+       void *_Cdecl farmalloc( unsigned long nbytes );\r
+#    else\r
+#      include <alloc.h>\r
+#    endif\r
+#  else /* MSC or DJGPP */\r
+#    include <malloc.h>\r
+#  endif\r
+#endif\r
+\r
+#ifdef AMIGA\r
+#  define OS_CODE  0x01\r
+#endif\r
+\r
+#if defined(VAXC) || defined(VMS)\r
+#  define OS_CODE  0x02\r
+#  define F_OPEN(name, mode) \\r
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")\r
+#endif\r
+\r
+#if defined(ATARI) || defined(atarist)\r
+#  define OS_CODE  0x05\r
+#endif\r
+\r
+#ifdef OS2\r
+#  define OS_CODE  0x06\r
+#  ifdef M_I86\r
+#    include <malloc.h>\r
+#  endif\r
+#endif\r
+\r
+#if defined(MACOS) || defined(TARGET_OS_MAC)\r
+#  define OS_CODE  0x07\r
+#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os\r
+#    include <unix.h> /* for fdopen */\r
+#  else\r
+#    ifndef fdopen\r
+#      define fdopen(fd,mode) NULL /* No fdopen() */\r
+#    endif\r
+#  endif\r
+#endif\r
+\r
+#ifdef TOPS20\r
+#  define OS_CODE  0x0a\r
+#endif\r
+\r
+#ifdef WIN32\r
+#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */\r
+#    define OS_CODE  0x0b\r
+#  endif\r
+#endif\r
+\r
+#ifdef __50SERIES /* Prime/PRIMOS */\r
+#  define OS_CODE  0x0f\r
+#endif\r
+\r
+#if defined(_BEOS_) || defined(RISCOS)\r
+#  define fdopen(fd,mode) NULL /* No fdopen() */\r
+#endif\r
+\r
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX\r
+#  if defined(_WIN32_WCE)\r
+#    define fdopen(fd,mode) NULL /* No fdopen() */\r
+#    ifndef _PTRDIFF_T_DEFINED\r
+       typedef int ptrdiff_t;\r
+#      define _PTRDIFF_T_DEFINED\r
+#    endif\r
+#  else\r
+#    define fdopen(fd,type)  _fdopen(fd,type)\r
+#  endif\r
+#endif\r
+\r
+#if defined(__BORLANDC__)\r
+  #pragma warn -8004\r
+  #pragma warn -8008\r
+  #pragma warn -8066\r
+#endif\r
+\r
+/* provide prototypes for these when building zlib without LFS */\r
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0\r
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));\r
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));\r
+#endif\r
+\r
+        /* common defaults */\r
+\r
+#ifndef OS_CODE\r
+#  define OS_CODE  0x03  /* assume Unix */\r
+#endif\r
+\r
+#ifndef F_OPEN\r
+#  define F_OPEN(name, mode) fopen((name), (mode))\r
+#endif\r
+\r
+         /* functions */\r
+\r
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)\r
+#  ifndef HAVE_VSNPRINTF\r
+#    define HAVE_VSNPRINTF\r
+#  endif\r
+#endif\r
+#if defined(__CYGWIN__)\r
+#  ifndef HAVE_VSNPRINTF\r
+#    define HAVE_VSNPRINTF\r
+#  endif\r
+#endif\r
+#ifndef HAVE_VSNPRINTF\r
+#  ifdef MSDOS\r
+     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),\r
+        but for now we just assume it doesn't. */\r
+#    define NO_vsnprintf\r
+#  endif\r
+#  ifdef __TURBOC__\r
+#    define NO_vsnprintf\r
+#  endif\r
+#  ifdef WIN32\r
+     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */\r
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)\r
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )\r
+#         define vsnprintf _vsnprintf\r
+#      endif\r
+#    endif\r
+#  endif\r
+#  ifdef __SASC\r
+#    define NO_vsnprintf\r
+#  endif\r
+#endif\r
+#ifdef VMS\r
+#  define NO_vsnprintf\r
+#endif\r
+\r
+#if defined(pyr)\r
+#  define NO_MEMCPY\r
+#endif\r
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)\r
+ /* Use our own functions for small and medium model with MSC <= 5.0.\r
+  * You may have to use the same strategy for Borland C (untested).\r
+  * The __SC__ check is for Symantec.\r
+  */\r
+#  define NO_MEMCPY\r
+#endif\r
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)\r
+#  define HAVE_MEMCPY\r
+#endif\r
+#ifdef HAVE_MEMCPY\r
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */\r
+#    define zmemcpy _fmemcpy\r
+#    define zmemcmp _fmemcmp\r
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)\r
+#  else\r
+#    define zmemcpy memcpy\r
+#    define zmemcmp memcmp\r
+#    define zmemzero(dest, len) memset(dest, 0, len)\r
+#  endif\r
+#else\r
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));\r
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));\r
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));\r
+#endif\r
+\r
+/* Diagnostic functions */\r
+#ifdef DEBUG\r
+#  include <stdio.h>\r
+   extern int ZLIB_INTERNAL z_verbose;\r
+   extern void ZLIB_INTERNAL z_error OF((char *m));\r
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}\r
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}\r
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}\r
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}\r
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}\r
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}\r
+#else\r
+#  define Assert(cond,msg)\r
+#  define Trace(x)\r
+#  define Tracev(x)\r
+#  define Tracevv(x)\r
+#  define Tracec(c,x)\r
+#  define Tracecv(c,x)\r
+#endif\r
+\r
+\r
+voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,\r
+                        unsigned size));\r
+void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));\r
+\r
+#define ZALLOC(strm, items, size) \\r
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))\r
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))\r
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}\r
+\r
+#endif /* ZUTIL_H */\r