diff --git a/CMakeLists.txt b/CMakeLists.txt index cc3d0f17..c9d35167 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.2) set(PROJECT_NAME shadowsocks-libev) -set(RELEASE_DATE 2017-12-29) -set(PROJECT_VERSION "3.1.2") +set(RELEASE_DATE 2018-1-15) +set(PROJECT_VERSION "3.1.3") set(PROJECT_DESC "a lightweight secured socks5 proxy") set(PROJECT_URL "https://shadowsocks.org") set(PROJECT_ISSUES_URL "https://github.com/shadowsocks/shadowsocks-libev") diff --git a/Changes b/Changes index 788cfde1..ed2e9ae8 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,9 @@ +shadowsocks-libev (3.1.3-1) unstable; urgency=medium + + * Fix a bug in UDP relay. + + -- Max Lv Mon, 15 Jan 2018 17:19:31 -0800 + shadowsocks-libev (3.1.2-1) unstable; urgency=medium * Fix a bug in DNS resolver. diff --git a/README.md b/README.md index e149162b..a77084b3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It is a port of [Shadowsocks](https://github.com/shadowsocks/shadowsocks) created by [@clowwindy](https://github.com/clowwindy), and maintained by [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang). -Current version: 3.1.2 | [Changelog](debian/changelog) +Current version: 3.1.3 | [Changelog](debian/changelog) Travis CI: [![Travis CI](https://travis-ci.org/shadowsocks/shadowsocks-libev.svg?branch=master)](https://travis-ci.org/shadowsocks/shadowsocks-libev) @@ -491,7 +491,7 @@ setting up your server's firewall rules to limit connections from each user: ``` Copyright: 2013-2015, Clow Windy - 2013-2017, Max Lv + 2013-2018, Max Lv 2014, Linus Yang This program is free software: you can redistribute it and/or modify diff --git a/configure.ac b/configure.ac index c45cc9d3..d7cef6b6 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], [3.1.2], [max.c.lv@gmail.com]) +AC_INIT([shadowsocks-libev], [3.1.3], [max.c.lv@gmail.com]) AC_CONFIG_SRCDIR([src/crypto.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(auto) diff --git a/debian/changelog b/debian/changelog index 788cfde1..ed2e9ae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +shadowsocks-libev (3.1.3-1) unstable; urgency=medium + + * Fix a bug in UDP relay. + + -- Max Lv Mon, 15 Jan 2018 17:19:31 -0800 + shadowsocks-libev (3.1.2-1) unstable; urgency=medium * Fix a bug in DNS resolver. diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index bd3ba53e..f2010a18 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine MAINTAINER kev -ARG SS_VER=3.1.2 +ARG SS_VER=3.1.3 ARG SS_URL=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$SS_VER/shadowsocks-libev-$SS_VER.tar.gz ENV SERVER_ADDR 0.0.0.0 diff --git a/src/acl.c b/src/acl.c index 480c829b..07373607 100644 --- a/src/acl.c +++ b/src/acl.c @@ -1,7 +1,7 @@ /* * acl.c - Manage the ACL (Access Control List) * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/acl.h b/src/acl.h index deba51bf..cfff5baf 100644 --- a/src/acl.h +++ b/src/acl.h @@ -1,7 +1,7 @@ /* * acl.h - Define the ACL interface * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/aead.c b/src/aead.c index 1ea3e4d3..b80a5631 100644 --- a/src/aead.c +++ b/src/aead.c @@ -1,7 +1,7 @@ /* * aead.c - Manage AEAD ciphers * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/aead.h b/src/aead.h index 5095da50..b1b95939 100644 --- a/src/aead.h +++ b/src/aead.h @@ -1,7 +1,7 @@ /* * aead.h - Define the AEAD interface * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/android.c b/src/android.c index 1cf5065c..d7bbcf4b 100644 --- a/src/android.c +++ b/src/android.c @@ -1,7 +1,7 @@ /* * android.c - Setup IPC for shadowsocks-android * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/cache.c b/src/cache.c index cca548d5..a35b9566 100644 --- a/src/cache.c +++ b/src/cache.c @@ -1,7 +1,7 @@ /* * cache.c - Manage the connection cache for UDPRELAY * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/cache.h b/src/cache.h index ce655022..1bca1a0e 100644 --- a/src/cache.h +++ b/src/cache.h @@ -1,7 +1,7 @@ /* * cache.h - Define the cache manager interface * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/common.h b/src/common.h index fdf0ea60..079c367f 100644 --- a/src/common.h +++ b/src/common.h @@ -1,7 +1,7 @@ /* * common.h - Provide global definitions * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, 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/crypto.c b/src/crypto.c index d27b04dd..df608cea 100644 --- a/src/crypto.c +++ b/src/crypto.c @@ -1,7 +1,7 @@ /* * crypto.c - Manage the global crypto * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/crypto.h b/src/crypto.h index e877e8f9..69a46945 100644 --- a/src/crypto.h +++ b/src/crypto.h @@ -1,7 +1,7 @@ /* * crypto.h - Define the enryptor's interface * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/jconf.c b/src/jconf.c index 3ef9894e..84e80f18 100644 --- a/src/jconf.c +++ b/src/jconf.c @@ -1,7 +1,7 @@ /* * jconf.c - Parse the JSON format config file * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, 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 0fbaa8d9..77512e4f 100644 --- a/src/jconf.h +++ b/src/jconf.h @@ -1,7 +1,7 @@ /* * jconf.h - Define the config data structure * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, 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/local.c b/src/local.c index 84a9ddbc..b116461b 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 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/local.h b/src/local.h index 5c510907..b948afa9 100644 --- a/src/local.h +++ b/src/local.h @@ -1,7 +1,7 @@ /* * local.h - Define the client's buffers and callbacks * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/manager.c b/src/manager.c index 940f5c2b..fc99e190 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1,7 +1,7 @@ /* * server.c - Provide shadowsocks service * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/manager.h b/src/manager.h index 522f393c..3130bf3d 100644 --- a/src/manager.h +++ b/src/manager.h @@ -1,7 +1,7 @@ /* * server.h - Define shadowsocks server's buffers and callbacks * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/netutils.c b/src/netutils.c index 8f6e7fc8..edf6f66e 100644 --- a/src/netutils.c +++ b/src/netutils.c @@ -1,7 +1,7 @@ /* * netutils.c - Network utilities * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/netutils.h b/src/netutils.h index ebc29a9e..e5c98707 100644 --- a/src/netutils.h +++ b/src/netutils.h @@ -1,7 +1,7 @@ /* * netutils.h - Network utilities * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/plugin.c b/src/plugin.c index 6abdc8a1..f44041cc 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -1,7 +1,7 @@ /* * plugin.c - Manage plugins * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/plugin.h b/src/plugin.h index d4f4269e..090ad974 100644 --- a/src/plugin.h +++ b/src/plugin.h @@ -1,7 +1,7 @@ /* * acl.h - Define the ACL interface * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/ppbloom.c b/src/ppbloom.c index d06dc011..35cc365b 100644 --- a/src/ppbloom.c +++ b/src/ppbloom.c @@ -1,7 +1,7 @@ /* * ppbloom.c - Ping-Pong Bloom Filter for nonce reuse detection * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/ppbloom.h b/src/ppbloom.h index 5316b435..1601fc97 100644 --- a/src/ppbloom.h +++ b/src/ppbloom.h @@ -1,7 +1,7 @@ /* * ppbloom.h - Define the Ping-Pong Bloom Filter interface * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/redir.c b/src/redir.c index c721cc0e..e748aa8e 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 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/redir.h b/src/redir.h index ac1ee8b5..8f040c92 100644 --- a/src/redir.h +++ b/src/redir.h @@ -1,6 +1,6 @@ /* * redir.h - Define the redirector's buffers and callbacks * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/server.c b/src/server.c index b7d4824d..b5f78544 100644 --- a/src/server.c +++ b/src/server.c @@ -1,7 +1,7 @@ /* * server.c - Provide shadowsocks service * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/server.h b/src/server.h index 6ba561cb..d7a2d1b0 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 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/shadowsocks.h b/src/shadowsocks.h index a04cf4b6..2c37739b 100644 --- a/src/shadowsocks.h +++ b/src/shadowsocks.h @@ -1,7 +1,7 @@ /* * shadowsocks.h - Header files of library interfaces * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, 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/stream.c b/src/stream.c index 4407fcb7..5196c9ef 100644 --- a/src/stream.c +++ b/src/stream.c @@ -1,7 +1,7 @@ /* * stream.c - Manage stream ciphers * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/stream.h b/src/stream.h index 92727bb0..97742703 100644 --- a/src/stream.h +++ b/src/stream.h @@ -1,7 +1,7 @@ /* * encrypt.h - Define the enryptor's interface * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/tunnel.c b/src/tunnel.c index 27573c14..ddc10396 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 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/tunnel.h b/src/tunnel.h index 9cd86c21..ae219345 100644 --- a/src/tunnel.h +++ b/src/tunnel.h @@ -1,7 +1,7 @@ /* * tunnel.h - Define tunnel's buffers and callbacks * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/udprelay.c b/src/udprelay.c index ed301adf..4dbe2414 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 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/udprelay.h b/src/udprelay.h index 18421b9a..0068adff 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 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/utils.c b/src/utils.c index 35f736e6..af8a871a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /* * utils.c - Misc utilities * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. * diff --git a/src/utils.h b/src/utils.h index 0b1825b6..c0b72891 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,7 @@ /* * utils.h - Misc utilities * - * Copyright (C) 2013 - 2017, Max Lv + * Copyright (C) 2013 - 2018, Max Lv * * This file is part of the shadowsocks-libev. *