diff --git a/README.md b/README.md index 3dd3de25..2b0fe8bc 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ It is a port of [shadowsocks](https://github.com/shadowsocks/shadowsocks) created by [@clowwindy](https://github.com/clowwindy) maintained by [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang). -Current version: 1.6.3 | [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-libev.png?branch=master)](https://travis-ci.org/shadowsocks/shadowsocks-libev) | [Changelog](Changes) +Current version: 1.6.4 | [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-libev.png?branch=master)](https://travis-ci.org/shadowsocks/shadowsocks-libev) | [Changelog](Changes) Features -------- diff --git a/configure b/configure index f7f3ba42..4b53f7c2 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for shadowsocks-libev 1.6.3. +# Generated by GNU Autoconf 2.69 for shadowsocks-libev 1.6.4. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shadowsocks-libev' PACKAGE_TARNAME='shadowsocks-libev' -PACKAGE_VERSION='1.6.3' -PACKAGE_STRING='shadowsocks-libev 1.6.3' +PACKAGE_VERSION='1.6.4' +PACKAGE_STRING='shadowsocks-libev 1.6.4' PACKAGE_BUGREPORT='max.c.lv@gmail.com' PACKAGE_URL='' @@ -1336,7 +1336,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures shadowsocks-libev 1.6.3 to adapt to many kinds of systems. +\`configure' configures shadowsocks-libev 1.6.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1407,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shadowsocks-libev 1.6.3:";; + short | recursive ) echo "Configuration of shadowsocks-libev 1.6.4:";; esac cat <<\_ACEOF @@ -1528,7 +1528,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shadowsocks-libev configure 1.6.3 +shadowsocks-libev configure 1.6.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2051,7 +2051,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by shadowsocks-libev $as_me 1.6.3, which was +It was created by shadowsocks-libev $as_me 1.6.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2872,7 +2872,7 @@ fi # Define the identity of the package. PACKAGE='shadowsocks-libev' - VERSION='1.6.3' + VERSION='1.6.4' cat >>confdefs.h <<_ACEOF @@ -15636,7 +15636,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by shadowsocks-libev $as_me 1.6.3, which was +This file was extended by shadowsocks-libev $as_me 1.6.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15702,7 +15702,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -shadowsocks-libev config.status 1.6.3 +shadowsocks-libev config.status 1.6.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 11c23d26..532aaf0f 100755 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl -*- Autoconf -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) -AC_INIT([shadowsocks-libev], [1.6.3], [max.c.lv@gmail.com]) +AC_INIT([shadowsocks-libev], [1.6.4], [max.c.lv@gmail.com]) AC_CONFIG_SRCDIR([src/encrypt.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(auto) diff --git a/debian/changelog b/debian/changelog index f88db018..aedc8b2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +shadowsocks-libev (1.6.4-1) unstable; urgency=low + + * Update documents. + + -- Max Lv Wed, 07 Jan 2015 21:48:58 +0900 + shadowsocks-libev (1.6.3-1) unstable; urgency=low * Refine ss-redir. diff --git a/openwrt/Makefile b/openwrt/Makefile index c7f8aab1..76ffebe1 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocks-libev -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.6.4 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/archive diff --git a/src/acl.c b/src/acl.c index 5cf67fef..59d69755 100644 --- a/src/acl.c +++ b/src/acl.c @@ -1,7 +1,7 @@ /* * acl.c - Manage the ACL (Access Control List) * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/acl.h b/src/acl.h index 7a32d332..95f5290a 100644 --- a/src/acl.h +++ b/src/acl.h @@ -1,7 +1,7 @@ /* * acl.h - Define the ACL interface * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/cache.c b/src/cache.c index b8673c7b..8dc38485 100644 --- a/src/cache.c +++ b/src/cache.c @@ -1,7 +1,7 @@ /* * cache.c - Manage the connection cache for UDPRELAY * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * @@ -44,7 +44,7 @@ @return EINVAL if dst is NULL, ENOMEM if malloc fails, 0 otherwise */ int cache_create(struct cache **dst, const size_t capacity, - void (*free_cb) (void *element)) + void (*free_cb)(void *element)) { struct cache *new = NULL; diff --git a/src/cache.h b/src/cache.h index e1a76da0..1eccdb27 100644 --- a/src/cache.h +++ b/src/cache.h @@ -1,7 +1,7 @@ /* * cache.c - Define the cache manager interface * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * @@ -52,7 +52,7 @@ struct cache { extern int cache_create(struct cache **dst, const size_t capacity, - void (*free_cb) (void *element)); + void (*free_cb)(void *element)); extern int cache_delete(struct cache *cache, int keep_data); extern int cache_lookup(struct cache *cache, char *key, void *result); extern int cache_insert(struct cache *cache, char *key, void *data); diff --git a/src/common.h b/src/common.h index 18a609bf..858ada99 100644 --- a/src/common.h +++ b/src/common.h @@ -1,7 +1,7 @@ /* * common.h - Provide global definitions * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * shadowsocks-libev is free software; you can redistribute it and/or modify diff --git a/src/encrypt.c b/src/encrypt.c index 6767024f..114060e9 100644 --- a/src/encrypt.c +++ b/src/encrypt.c @@ -1,7 +1,7 @@ /* * encrypt.c - Manage the global encryptor * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/encrypt.h b/src/encrypt.h index 18030f28..cb2d9209 100644 --- a/src/encrypt.h +++ b/src/encrypt.h @@ -1,7 +1,7 @@ /* * encrypt.h - Define the enryptor's interface * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/jconf.c b/src/jconf.c index d947ded6..04331af2 100644 --- a/src/jconf.c +++ b/src/jconf.c @@ -1,7 +1,7 @@ /* * jconf.c - Parse the JSON format config file * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * shadowsocks-libev is free software; you can redistribute it and/or modify diff --git a/src/jconf.h b/src/jconf.h index a3cf6dec..e29814da 100644 --- a/src/jconf.h +++ b/src/jconf.h @@ -1,7 +1,7 @@ /* * server.c - Define the config data structure * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * shadowsocks-libev is free software; you can redistribute it and/or modify diff --git a/src/json.c b/src/json.c index 0690de42..f831c788 100644 --- a/src/json.c +++ b/src/json.c @@ -211,7 +211,7 @@ case ' ': case '\t': case '\r' #define string_add(b) \ do { if (!state.first_pass) { string [string_length] = b; \ - } ++string_length; } while (0); + } ++string_length; } while (0) static const long flag_next = 1 << 0, diff --git a/src/local.c b/src/local.c index 0bde9f50..b1324ebb 100644 --- a/src/local.c +++ b/src/local.c @@ -1,7 +1,7 @@ /* * local.c - Setup a socks5 proxy through remote shadowsocks server * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * @@ -909,12 +909,9 @@ int main(int argc, char **argv) int option_index = 0; static struct option long_options[] = { - { "fast-open", no_argument, 0, - 0 }, - { "acl", required_argument, 0, - 0 }, - { 0, 0, 0, - 0 } + { "fast-open", no_argument, 0, 0 }, + { "acl", required_argument, 0, 0 }, + { 0, 0, 0, 0 } }; opterr = 0; diff --git a/src/local.h b/src/local.h index 90252dc4..9632f954 100644 --- a/src/local.h +++ b/src/local.h @@ -1,7 +1,7 @@ /* * local.h - Define the clinet's buffers and callbacks * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/redir.c b/src/redir.c index d8a775bd..14b95031 100644 --- a/src/redir.c +++ b/src/redir.c @@ -2,7 +2,7 @@ * redir.c - Provide a transparent TCP proxy through remote shadowsocks * server * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/redir.h b/src/redir.h index 95a94127..47810373 100644 --- a/src/redir.h +++ b/src/redir.h @@ -1,7 +1,7 @@ /* * redir.h - Define the redirector's buffers and callbacks * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/server.c b/src/server.c index 21ab1b99..1e6d7ab1 100644 --- a/src/server.c +++ b/src/server.c @@ -1,7 +1,7 @@ /* * server.c - Provide shadowsocks service * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * @@ -931,8 +931,8 @@ int main(int argc, char **argv) int option_index = 0; static struct option long_options[] = { - { "fast-open", no_argument, 0, 0 }, - { 0, 0, 0, 0 } + { "fast-open", no_argument, 0, 0 }, + { 0, 0, 0, 0 } }; opterr = 0; diff --git a/src/server.h b/src/server.h index 2f5dc21a..10d248b8 100644 --- a/src/server.h +++ b/src/server.h @@ -1,7 +1,7 @@ /* * server.h - Define shadowsocks server's buffers and callbacks * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/shadowsocks.h b/src/shadowsocks.h index 856875e6..1e435b5a 100644 --- a/src/shadowsocks.h +++ b/src/shadowsocks.h @@ -1,7 +1,7 @@ /* * shadowsocks.h - Header files of library interfaces * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * shadowsocks-libev is free software; you can redistribute it and/or modify diff --git a/src/tunnel.c b/src/tunnel.c index 3a0d8597..0282b65a 100644 --- a/src/tunnel.c +++ b/src/tunnel.c @@ -1,7 +1,7 @@ /* * tunnel.c - Setup a local port forwarding through remote shadowsocks server * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/tunnel.h b/src/tunnel.h index 12f99942..19458d07 100644 --- a/src/tunnel.h +++ b/src/tunnel.h @@ -1,7 +1,7 @@ /* * tunnel.h - Define tunnel's buffers and callbacks * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/udprelay.c b/src/udprelay.c index 6983f03f..8fecb636 100644 --- a/src/udprelay.c +++ b/src/udprelay.c @@ -1,7 +1,7 @@ /* * udprelay.c - Setup UDP relay for both client and server * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/udprelay.h b/src/udprelay.h index 0d38a83e..57e063f0 100644 --- a/src/udprelay.h +++ b/src/udprelay.h @@ -1,7 +1,7 @@ /* * udprelay.h - Define UDP relay's buffers and callbacks * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/utils.c b/src/utils.c index 1c14aa68..dd4ee0c4 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /* * utils.c - Misc utilities * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/utils.h b/src/utils.h index e7023e66..afed8650 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,7 @@ /* * utils.h - Misc utilities * - * Copyright (C) 2013 - 2014, Max Lv + * Copyright (C) 2013 - 2015, Max Lv * * This file is part of the shadowsocks-libev. *