Merge pull request #147 from madeye/v1.5.2

V1.5.2

Author: madeye

.uncrustify.cfg

@@ -0,0 +1,80 @@
+#
+# based on uncrustify config file for the linux kernel
+#
+
+code_width               = 80
+indent_case_brace        = 4
+indent_columns           = 4
+indent_label             = 2         # pos: absolute col, neg: relative column
+indent_with_tabs         = 0
+
+#
+# inter-symbol newlines
+#
+nl_brace_else            = remove    # "} else" vs "} \n else" - cuddle else
+nl_brace_while           = remove    # "} while" vs "} \n while" - cuddle while
+nl_do_brace              = remove    # "do {" vs "do \n {"
+nl_else_brace            = remove    # "else {" vs "else \n {"
+nl_enum_brace            = remove    # "enum {" vs "enum \n {"
+nl_fcall_brace           = remove    # "list_for_each() {" vs "list_for_each()\n{"
+nl_fdef_brace            = force     # "int foo() {" vs "int foo()\n{"
+nl_for_brace             = remove    # "for () {" vs "for () \n {"
+nl_func_var_def_blk      = 0         # don't add newlines after a block of var declarations
+nl_if_brace              = remove    # "if () {" vs "if () \n {"
+nl_multi_line_define     = true
+nl_struct_brace          = remove    # "struct {" vs "struct \n {"
+nl_switch_brace          = remove    # "switch () {" vs "switch () \n {"
+nl_union_brace           = remove    # "union {" vs "union \n {"
+nl_while_brace           = remove    # "while () {" vs "while () \n {"
+
+
+#
+# Source code modifications
+#
+mod_full_brace_do        = force     # "do a--; while ();" vs "do { a--; } while ();"
+mod_full_brace_for       = force     # "for () a--;" vs "for () { a--; }"
+mod_full_brace_if        = force     # "if (a) a--;" vs "if (a) { a--; }"
+mod_full_brace_nl        = 3         # don't remove if more than 3 newlines
+mod_full_brace_while     = force     # "while (a) a--;" vs "while (a) { a--; }"
+mod_paren_on_return      = remove    # "return 1;" vs "return (1);"
+
+
+#
+# inter-character spacing options
+#
+sp_after_cast            = remove    # "(int) a" vs "(int)a"
+sp_after_comma           = force
+sp_after_sparen          = force     # "if () {" vs "if (){"
+sp_arith                 = force
+sp_assign                = force
+sp_assign                = force
+sp_before_comma          = remove
+sp_before_ptr_star       = force     # "char *foo" vs "char* foo
+sp_before_sparen         = force     # "if (" vs "if("
+sp_between_ptr_star      = remove    # "char * *foo" vs "char **foo"
+sp_bool                  = force
+sp_compare               = force
+sp_func_call_paren       = remove    # "foo (" vs "foo("
+sp_func_def_paren        = remove    # "int foo (){" vs "int foo(){"
+sp_func_proto_paren      = remove    # "int foo ();" vs "int foo();"
+sp_inside_braces         = force     # "{ 1 }" vs "{1}"
+sp_inside_braces_enum    = force     # "{ 1 }" vs "{1}"
+sp_inside_braces_struct  = force     # "{ 1 }" vs "{1}"
+sp_inside_sparen         = remove
+sp_paren_brace           = force
+sp_sizeof_paren          = remove    # "sizeof (int)" vs "sizeof(int)"
+sp_else_brace            = force
+sp_brace_else            = force
+
+#
+# Aligning stuff
+#
+align_enum_equ_span      = 4         # '=' in enum definition
+align_nl_cont            = true
+align_on_tabstop         = FALSE     # align on tabstops
+align_right_cmt_span     = 3
+align_struct_init_span   = 1
+align_struct_init_span   = 3         # align stuff in a structure init '= { }'
+align_var_def_star_style = 2         # void  *foo;
+align_var_struct_span    = 0
+align_with_tabs          = FALSE     # use tabs to align

README.md

@@ -11,7 +11,7 @@ It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks)
 created by [@clowwindy](https://github.com/clowwindy) maintained by 
 [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang).
 
-Current version: 1.5.1 | [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev) | [Changelog](Changes)
+Current version: 1.5.2 | [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev) | [Changelog](Changes)
 
 Features
 --------

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for shadowsocks 1.5.1.
+# Generated by GNU Autoconf 2.68 for shadowsocks 1.5.2.
 #
 # Report bugs to <max.c.lv@gmail.com>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shadowsocks'
 PACKAGE_TARNAME='shadowsocks'
-PACKAGE_VERSION='1.5.1'
-PACKAGE_STRING='shadowsocks 1.5.1'
+PACKAGE_VERSION='1.5.2'
+PACKAGE_STRING='shadowsocks 1.5.2'
 PACKAGE_BUGREPORT='max.c.lv@gmail.com'
 PACKAGE_URL=''
 
@@ -1307,7 +1307,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 1.5.1 to adapt to many kinds of systems.
+\`configure' configures shadowsocks 1.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1377,7 +1377,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shadowsocks 1.5.1:";;
+     short | recursive ) echo "Configuration of shadowsocks 1.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1494,7 +1494,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shadowsocks configure 1.5.1
+shadowsocks configure 1.5.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2016,7 +2016,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 $as_me 1.5.1, which was
+It was created by shadowsocks $as_me 1.5.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2837,7 +2837,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shadowsocks'
- VERSION='1.5.1'
+ VERSION='1.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15533,7 +15533,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 $as_me 1.5.1, which was
+This file was extended by shadowsocks $as_me 1.5.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15599,7 +15599,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 config.status 1.5.1
+shadowsocks config.status 1.5.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

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], [1.5.1], [max.c.lv@gmail.com])
+AC_INIT([shadowsocks], [1.5.2], [max.c.lv@gmail.com])
 AC_CONFIG_SRCDIR([src/encrypt.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(auto)

debian/changelog

@@ -1,3 +1,9 @@
+shadowsocks (1.5.2-1) unstable; urgency=low
+
+  * Handle SIGTERM and SIGKILL nicely.
+
+ -- Max Lv <max.c.lv@gmail.com>  Tue, 12 Nov 2014 13:11:29 +0800
+
 shadowsocks (1.5.1-1) unstable; urgency=low
 
   * Fix a bug of tcp fast open.

openwrt/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadowsocks-libev
-PKG_VERSION:=1.5.1
+PKG_VERSION:=1.5.2
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_URL:=https://github.com/madeye/shadowsocks-libev/archive

src/acl.c

@@ -34,26 +34,20 @@ static void parse_addr_cidr(const char *str, char **host, int *cidr)
     char *pch;
 
     pch = strchr(str, '/');
-    while (pch != NULL)
-    {
+    while (pch != NULL) {
         n++;
         ret = pch - str;
         pch = strchr(pch + 1, '/');
     }
-    if (n > 1)
-    {
-        if (strcmp(str+ret, "]") != 0)
-        {
+    if (n > 1) {
+        if (strcmp(str + ret, "]") != 0) {
             ret = -1;
         }
     }
-    if (ret == -1)
-    {
+    if (ret == -1) {
         *host = strdup(str);
         *cidr = -1;
-    }
-    else
-    {
+    } else {
         *host = ss_strndup(str, ret);
         *cidr = atoi(strdup(str + ret + 1));
     }
@@ -75,39 +69,35 @@ int init_acl(const char *path)
     }
 
     char line[256];
-    while(!feof(f))
-    {
-        if (fgets(line, 256, f))
-        {
+    while (!feof(f)) {
+        if (fgets(line, 256, f)) {
             // Trim the newline
             int len = strlen(line);
-            if (len > 0 && line[len - 1] == '\n')
-            {
+            if (len > 0 && line[len - 1] == '\n') {
                 line[len - 1] = '\0';
             }
 
             char *host = NULL;
             int cidr;
             parse_addr_cidr(line, &host, &cidr);
 
-            if (cidr == -1)
-            {
+            if (cidr == -1) {
                 cork_string_array_append(&acl_domain_array, host);
-            }
-            else
-            {
+            } else {
                 struct cork_ipv4 addr;
                 int err = cork_ipv4_init(&addr, host);
-                if (!err)
-                {
-                    if (cidr >= 0)
+                if (!err) {
+                    if (cidr >= 0) {
                         ipset_ipv4_add_network(&acl_ip_set, &addr, cidr);
-                    else
+                    } else {
                         ipset_ipv4_add(&acl_ip_set, &addr);
+                    }
                 }
             }
 
-            if (host != NULL) free(host);
+            if (host != NULL) {
+                free(host);
+            }
         }
     }
 
@@ -121,39 +111,43 @@ void free_acl(void)
     ipset_done(&acl_ip_set);
 }
 
-int acl_contains_domain(const char* domain)
+int acl_contains_domain(const char * domain)
 {
     const char **list = acl_domain_array.items;
     const int size = acl_domain_array.size;
     const int domain_len = strlen(domain);
     int i, offset;
 
-    for (i = 0; i < size; i++)
-    {
+    for (i = 0; i < size; i++) {
         const char *acl_domain = list[i];
         const int acl_domain_len = strlen(acl_domain);
-        if (acl_domain_len > domain_len) continue;
+        if (acl_domain_len > domain_len) {
+            continue;
+        }
         int match = true;
-        for (offset = 1; offset <= acl_domain_len; offset++)
-        {
-            if (domain[domain_len - offset] != acl_domain[acl_domain_len - offset])
-            {
+        for (offset = 1; offset <= acl_domain_len; offset++) {
+            if (domain[domain_len - offset] !=
+                acl_domain[acl_domain_len - offset]) {
                 match = false;
                 break;
             }
         }
-        if (match) return 1;
+        if (match) {
+            return 1;
+        }
     }
 
 
     return 0;
 }
 
-int acl_contains_ip(const char* host)
+int acl_contains_ip(const char * host)
 {
     struct cork_ipv4 addr;
     int err = cork_ipv4_init(&addr, host);
-    if (err) return 0;
+    if (err) {
+        return 0;
+    }
 
     struct cork_ip ip;
     cork_ip_from_ipv4(&ip, &addr);

src/acl.h

@@ -26,7 +26,7 @@
 int init_acl(const char *path);
 void free_acl(void);
 
-int acl_contains_ip(const char* ip);
-int acl_contains_domain(const char* domain);
+int acl_contains_ip(const char * ip);
+int acl_contains_domain(const char * domain);
 
 #endif // _ACL_H