Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-25 18:23:42 +00:00
Code Releases Activity

bump version

Browse Source
This commit is contained in:
Max Lv
2015-02-08 11:03:19 +09:00
parent 5e68f3cd37
commit f87ee5b424
8 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -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: 2.1.2 | [Changelog](Changes)
Current version: 2.1.3 | [Changelog](Changes)
Travis CI: [![Travis CI](https://travis-ci.org/shadowsocks/shadowsocks-libev.png?branch=master)](https://travis-ci.org/shadowsocks/shadowsocks-libev) | Jenkins Matrix: [![Jenkins](https://jenkins.shadowvpn.org/buildStatus/icon?job=Shadowsocks-libev)](https://jenkins.shadowvpn.org/job/Shadowsocks-libev/)
@@ -255,7 +255,7 @@ Usage
only available on Linux kernel > 3.7.0
[--acl <acl_file>] config file of ACL (Access Control List)
only available in local mode
only available in local and server mode
[-v] verbose mode
acl/local.acl
+6
View File
@@ -0,0 +1,6 @@
127.0.0.1
::1
10.0.0.0/8
172.16.0.0/12
192.168.0.0/16
fc00::/7
configure
Vendored
+10 -10
View File
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.1.2.
# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.1.3.
#
# Report bugs to <max.c.lv@gmail.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='shadowsocks-libev'
PACKAGE_TARNAME='shadowsocks-libev'
PACKAGE_VERSION='2.1.2'
PACKAGE_STRING='shadowsocks-libev 2.1.2'
PACKAGE_VERSION='2.1.3'
PACKAGE_STRING='shadowsocks-libev 2.1.3'
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 2.1.2 to adapt to many kinds of systems.
\`configure' configures shadowsocks-libev 2.1.3 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 2.1.2:";;
short | recursive ) echo "Configuration of shadowsocks-libev 2.1.3:";;
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 2.1.2
shadowsocks-libev configure 2.1.3
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 2.1.2, which was
It was created by shadowsocks-libev $as_me 2.1.3, 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='2.1.2'
VERSION='2.1.3'
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 2.1.2, which was
This file was extended by shadowsocks-libev $as_me 2.1.3, 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 2.1.2
shadowsocks-libev config.status 2.1.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
configure.ac
+1 -1
View File
@@ -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], [2.1.2], [max.c.lv@gmail.com])
AC_INIT([shadowsocks-libev], [2.1.3], [max.c.lv@gmail.com])
AC_CONFIG_SRCDIR([src/encrypt.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(auto)
debian/changelog
Vendored
+6
View File
@@ -1,3 +1,9 @@
shadowsocks-libev (2.1.3-1) unstable; urgency=low
* Add ACL support to remote server.
-- Max Lv <max.c.lv@gmail.com> Sun, 08 Feb 2015 10:59:44 +0900
shadowsocks-libev (2.1.2-1) unstable; urgency=low
* Refine multiple port binding.
openwrt/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shadowsocks-libev
PKG_VERSION:=2.1.1
PKG_VERSION:=2.1.3
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/archive
src/local.c
+1 -1
View File
@@ -429,7 +429,7 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
LOGI("connect to %s:%s", host, port);
}
if ((acl && request->atyp == 1 && acl_contains_ip(host))) {
if ((acl && (request->atyp == 1 || request->atyp == 3) && acl_contains_ip(host))) {
if (verbose) {
LOGI("bypass %s:%s", host, port);
}
src/utils.c
+1 -1
View File
@@ -264,7 +264,7 @@ void usage()
printf(
" [--acl <acl_file>] config file of ACL (Access Control List)\n");
printf(
" only available in local mode\n");
" only available in local and server mode\n");
printf("\n");
printf(
" [-v] verbose mode\n");